Print AI feedback directly as fallback comment

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

administrator/components/com_testquestions/config.xml

@@ -0,0 +1,14 @@
+<?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>
+                <option value="groq">Groq</option>
+                <option value="gemini">Gemini</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/language/en-GB/com_testquestions.ini

@@ -46,6 +46,9 @@ COM_TESTQUESTIONS_ERROR_OPEN_PATTERN="Dla pytania otwartego wpisz wzorzec popraw
 COM_TESTQUESTIONS_ERROR_ALL_ANSWERS="Dla pytania zamkniętego uzupełnij wszystkie cztery odpowiedzi."
 COM_TESTQUESTIONS_ERROR_META="Wybierz poprawny czas i liczbę punktów."
 COM_TESTQUESTIONS_SETS="Zestawy pytań"
+COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL="Wyłącz wszystkie zestawy"
+COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL_CONFIRM="Czy na pewno wyłączyć wszystkie zestawy testów, w tym wszystkie warianty?"
+COM_TESTQUESTIONS_SETS_UNPUBLISHED_ALL="Wyłączono %s zestawów."
 COM_TESTQUESTIONS_NEW_SET="Nowy zestaw pytań"
 COM_TESTQUESTIONS_EDIT_SET="Edytuj zestaw pytań"
 COM_TESTQUESTIONS_SET_TITLE="Nazwa zestawu"
@@ -58,14 +61,58 @@ 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_SET_VARIANT_STATUS_INHERITED="Status publikacji wariantu jest taki sam jak status zestawu nadrzędnego i zmienia się razem z nim."
+COM_TESTQUESTIONS_AI_SETTINGS="Ustawienia AI"
+COM_TESTQUESTIONS_AI_PROVIDER="Dostawca AI"
+COM_TESTQUESTIONS_AI_API_KEY="Klucz API"
+COM_TESTQUESTIONS_AI_OPENAI_KEY="Klucz API OpenAI"
+COM_TESTQUESTIONS_AI_GROK_KEY="Klucz API Grok"
+COM_TESTQUESTIONS_AI_GROQ_KEY="Klucz API Groq"
+COM_TESTQUESTIONS_AI_GEMINI_KEY="Klucz API Gemini"
+COM_TESTQUESTIONS_AI_OPENAI_MODEL="Model OpenAI"
+COM_TESTQUESTIONS_AI_GROK_MODEL="Model Grok"
+COM_TESTQUESTIONS_AI_GROQ_MODEL="Model Groq API"
+COM_TESTQUESTIONS_AI_GEMINI_MODEL="Model Gemini"
+COM_TESTQUESTIONS_AI_MODEL_INVALID="Wybierz prawidłowy model dla każdego dostawcy AI."
+COM_TESTQUESTIONS_AI_TOKEN_USAGE="Wykorzystanie tokenów API"
+COM_TESTQUESTIONS_AI_TOKEN_USAGE_INFO="Suma użycia zapisanego przy ocenach AI we wszystkich wynikach testów. Powtórne oceny są zliczane, jeśli zostały wykonane po tej aktualizacji."
+COM_TESTQUESTIONS_AI_USAGE_CALLS="Liczba ocen"
+COM_TESTQUESTIONS_AI_USAGE_INPUT="Tokeny wejściowe"
+COM_TESTQUESTIONS_AI_USAGE_OUTPUT="Tokeny wyjściowe"
+COM_TESTQUESTIONS_AI_USAGE_TOTAL="Razem tokenów"
+COM_TESTQUESTIONS_AI_USAGE_COST="Koszt zapisany"
+COM_TESTQUESTIONS_PREVIEW_SELECTED="Podgląd zaznaczonych"
+COM_TESTQUESTIONS_PREVIEW_TITLE="Podgląd pytań testowych"
+COM_TESTQUESTIONS_PREVIEW_READONLY="Tryb podglądu — odpowiedzi są nieaktywne, test nie ma limitu czasu ani przycisku zakończenia."
+COM_TESTQUESTIONS_PREVIEW_EMPTY="Nie znaleziono pytań do wyświetlenia."
+COM_TESTQUESTIONS_PREVIEW_SELECT_QUESTIONS="Zaznacz pytania, które chcesz podejrzeć."
+COM_TESTQUESTIONS_PREVIEW_BACK="Wróć do listy pytań"
+COM_TESTQUESTIONS_PREVIEW_SET="Podgląd zestawu"
+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ń"
 COM_TESTQUESTIONS_SET_SEARCH="Szukaj zestawów..."
 COM_TESTQUESTIONS_SET_CATEGORY_FILTER="Filtruj pytania według kategorii"
+COM_TESTQUESTIONS_SET_CHOOSE_CATEGORY="Wybierz kategorię"
+COM_TESTQUESTIONS_SET_ID_FILTER="Filtruj pytania według ID"
+COM_TESTQUESTIONS_SET_ID_FILTER_HINT="Wpisz ID, np. 12, 34, 56"
+COM_TESTQUESTIONS_SET_SELECT_ALL_VISIBLE="Zaznacz wszystkie widoczne pytania"
 COM_TESTQUESTIONS_SET_ALL_CATEGORIES="Wszystkie kategorie"
 COM_TESTQUESTIONS_UNCATEGORIZED="Bez kategorii"
 COM_TESTQUESTIONS_SET_SHOW_DETAILS="Pokaż odpowiedzi"
@@ -78,9 +125,13 @@ 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_AI_TOKENS="Tokeny AI"
+COM_TESTQUESTIONS_RESULTS_AI_TOKENS_TOTAL="Łączne wykorzystanie tokenów w wynikach"
 COM_TESTQUESTIONS_RESULT_SCORE="Wynik"
 COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER="Punkty przed / po korekcie"
 COM_TESTQUESTIONS_RESULT_GRADE="Ocena"
+COM_TESTQUESTIONS_RESULT_NOT_ASSESSED="Nie sprawdzono"
+COM_TESTQUESTIONS_RESULT_GENERATE_PDF="Generuj PDF / drukuj"
 COM_TESTQUESTIONS_RESULT_DATE="Data zakończenia"
 COM_TESTQUESTIONS_RESULT_ANSWERS="Odpowiedzi"
 COM_TESTQUESTIONS_RESULT_EXECUTION_TIME="Czas wykonania"
@@ -94,10 +145,13 @@ 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_RESULTS_DELETED="Usunięto %s zapisanych testów."
+COM_TESTQUESTIONS_RESULTS_DELETE_NONE="Zaznacz testy, które chcesz usunąć."
 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_ANSWER_PARTIALLY_CORRECT="Odpowiedź częściowo poprawna"
 COM_TESTQUESTIONS_CORRECT_PATTERN="Wzorzec poprawnej odpowiedzi"
 COM_TESTQUESTIONS_SUBJECT="Przedmiot"
 COM_TESTQUESTIONS_SUBJECT_TITLE="Nazwa przedmiotu"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.17: zmieniono przyciski paska narzędzi podglądu zestawu.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.18: dodano filtrowanie dostępnych pytań po ID podczas edycji zestawu.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.19: usprawniono filtrowanie i zaznaczanie pytań w edycji zestawu.

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.22: kolejność odpowiedzi zamkniętych jest losowana i zapisywana dla podejścia.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.23: zachowano w wyniku kolejność pytań z wylosowanego testu.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.24: ukryto ocenę AI i korektę punktów dla pustych odpowiedzi.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.25: kolor oceny AI odzwierciedla poziom uznanych punktów.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.26: dodano zbiorcze usuwanie zapisanych testów.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.27: dodano dostawcę Groq API.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.28: dodano dostawcę Gemini API.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.29: ograniczono czas generowania oceny przez Gemini.

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

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

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.30: odczyt tokenów Gemini z pola usageMetadata.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.31.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.32.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.33.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.34.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.35.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.36.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.37.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.38.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.39.

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

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

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.40.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.41.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.42.

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

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

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

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

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

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

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

@@ -0,0 +1,5 @@
+UPDATE `#__extensions`
+SET `params` = JSON_REMOVE(`params`, '$.ai_grok_team_id', '$.ai_grok_management_key')
+WHERE `type` = 'component'
+  AND `element` = 'com_testquestions'
+  AND JSON_VALID(`params`);

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

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

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

@@ -0,0 +1,103 @@
+<?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;
+use Komponent\Component\Testquestions\Administrator\Service\AiService;
+
+class AiController extends BaseController
+{
+    public function save(): void
+    {
+        $this->saveSettings();
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=ai', false),
+            Text::_('COM_TESTQUESTIONS_AI_SETTINGS_SAVED')
+        );
+    }
+
+    private function saveSettings(): array
+    {
+        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', 'groq', 'gemini'], true)) {
+            throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_PROVIDER_INVALID'));
+        }
+
+        $models = AiService::availableModels();
+        $selectedModels = [];
+        foreach (['openai', 'grok', 'groq', 'gemini'] as $modelProvider) {
+            $model = trim($input->post->getString('ai_' . $modelProvider . '_model', ''));
+            if (!isset($models[$modelProvider][$model])) {
+                throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_MODEL_INVALID'));
+            }
+            $selectedModels[$modelProvider] = $model;
+        }
+
+        $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 : [];
+        $legacyKey = trim((string) ($settings['ai_api_key'] ?? ''));
+        $settings['ai_provider'] = $provider;
+        foreach ($selectedModels as $modelProvider => $model) {
+            $settings['ai_' . $modelProvider . '_model'] = $model;
+        }
+
+        foreach (['openai', 'grok', 'groq', 'gemini'] as $keyProvider) {
+            $fieldName = 'ai_' . $keyProvider . '_api_key';
+            $apiKey = trim((string) $input->post->get($fieldName, '', 'RAW'));
+            if ($apiKey !== '') {
+                $settings[$fieldName] = $apiKey;
+            }
+            if ($keyProvider === $provider && empty($settings[$fieldName]) && $legacyKey !== '') {
+                $settings[$fieldName] = $legacyKey;
+            }
+        }
+
+        unset($settings['ai_api_key']);
+        unset($settings['ai_grok_team_id'], $settings['ai_grok_management_key']);
+
+        $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'));
+        }
+
+        return $settings;
+    }
+
+    public function cancel(): void
+    {
+        $this->setRedirect(Route::_('index.php?option=com_testquestions&view=questions', false));
+    }
+}

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

@@ -4,7 +4,11 @@ namespace Komponent\Component\Testquestions\Administrator\Controller;
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
 
 class QuestionsController extends AdminController
 {
@@ -14,4 +18,28 @@ class QuestionsController extends AdminController
     {
         return parent::getModel($name, $prefix, $config);
     }
+
+    public function preview(): void
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
+        }
+
+        $user = Factory::getApplication()->getIdentity();
+        if (!$user->authorise('core.edit', 'com_testquestions') && !$user->authorise('core.manage', 'com_testquestions')) {
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+        }
+
+        $ids = array_values(array_unique(array_filter(array_map('intval', (array) $this->input->post->get('cid', [], 'array')))));
+        if (!$ids) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_testquestions&view=questions', false),
+                Text::_('COM_TESTQUESTIONS_PREVIEW_SELECT_QUESTIONS'),
+                'warning'
+            );
+            return;
+        }
+
+        $this->setRedirect(Route::_('index.php?option=com_testquestions&view=preview&ids=' . implode(',', $ids), false));
+    }
 }

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

@@ -32,6 +32,78 @@ class ResultController extends BaseController
         );
     }
 
+    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()) {

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

@@ -0,0 +1,54 @@
+<?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\AdminController;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+
+class ResultsController extends AdminController
+{
+    public function delete()
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
+        }
+
+        $user = Factory::getApplication()->getIdentity();
+        if (!$user->authorise('core.delete', 'com_testquestions')) {
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+        }
+
+        $ids = array_values(array_unique(array_filter(array_map(
+            'intval',
+            (array) $this->input->post->get('cid', [], 'array')
+        ), static function ($id) {
+            return $id > 0;
+        })));
+
+        if (!$ids) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_testquestions&view=results', false),
+                Text::_('COM_TESTQUESTIONS_RESULTS_DELETE_NONE'),
+                'warning'
+            );
+            return;
+        }
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $db->setQuery(
+            $db->getQuery(true)
+                ->delete($db->quoteName('#__testquestions_results'))
+                ->where($db->quoteName('id') . ' IN (' . implode(',', $ids) . ')')
+        )->execute();
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=results', false),
+            Text::sprintf('COM_TESTQUESTIONS_RESULTS_DELETED', $db->getAffectedRows())
+        );
+    }
+}

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

@@ -5,11 +5,40 @@ namespace Komponent\Component\Testquestions\Administrator\Controller;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
 
 class SetsController extends AdminController
 {
     protected $text_prefix = 'COM_TESTQUESTIONS';
 
+    public function unpublishall(): void
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
+        }
+
+        $user = Factory::getApplication()->getIdentity();
+        if (!$user->authorise('core.edit.state', 'com_testquestions') && !$user->authorise('core.edit', 'com_testquestions')) {
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+        }
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $db->setQuery(
+            $db->getQuery(true)
+                ->update($db->quoteName('#__testquestions_sets'))
+                ->set($db->quoteName('published') . ' = 0')
+                ->where($db->quoteName('published') . ' = 1')
+        )->execute();
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=sets', false),
+            Text::sprintf('COM_TESTQUESTIONS_SETS_UNPUBLISHED_ALL', $db->getAffectedRows())
+        );
+    }
+
     public function getModel($name = 'Set', $prefix = 'Administrator', $config = ['ignore_request' => true])
     {
         return parent::getModel($name, $prefix, $config);

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/PreviewModel.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+
+class PreviewModel extends BaseDatabaseModel
+{
+    public function getSet()
+    {
+        $setId = Factory::getApplication()->getInput()->getInt('set_id');
+        if ($setId < 1) {
+            return null;
+        }
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['id', 'title', 'test_content', 'image'])
+                ->from($db->quoteName('#__testquestions_sets'))
+                ->where($db->quoteName('id') . ' = ' . $setId)
+        )->loadObject();
+    }
+
+    public function getItems(): array
+    {
+        $input = Factory::getApplication()->getInput();
+        $setId = $input->getInt('set_id');
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        if ($setId > 0) {
+            return $db->setQuery(
+                $db->getQuery(true)
+                    ->select(['q.id', 'q.question_type', 'q.question', 'q.answer_a', 'q.answer_b', 'q.answer_c', 'q.answer_d', 'q.answer_open', 'q.correct_answer', 'q.image'])
+                    ->from($db->quoteName('#__testquestions_set_questions', 'sq'))
+                    ->innerJoin($db->quoteName('#__testquestions_questions', 'q') . ' ON q.id = sq.question_id')
+                    ->where('sq.set_id = ' . $setId)
+                    ->where('q.published = 1')
+                    ->order('sq.ordering ASC, q.id ASC')
+            )->loadObjectList();
+        }
+
+        $ids = array_values(array_unique(array_filter(array_map('intval', explode(',', $input->getString('ids', ''))))));
+
+        if (!$ids) {
+            return [];
+        }
+
+        $rows = $db->setQuery(
+            $db->getQuery(true)
+                ->select(['id', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'image'])
+                ->from($db->quoteName('#__testquestions_questions'))
+                ->where($db->quoteName('id') . ' IN (' . implode(',', $ids) . ')')
+        )->loadObjectList('id');
+
+        $items = [];
+        foreach ($ids as $id) {
+            if (isset($rows[$id])) {
+                $items[] = $rows[$id];
+            }
+        }
+
+        return $items;
+    }
+}

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
 {
@@ -15,7 +17,7 @@ class ResultModel extends BaseDatabaseModel
         $db = Factory::getContainer()->get('DatabaseDriver');
         $item = $db->setQuery(
             $db->getQuery(true)
-                ->select(['r.*', 's.title AS set_title', 'sub.title AS subject_title'])
+                ->select(['r.*', 's.title AS set_title', 's.image AS set_image', 'sub.title AS subject_title'])
                 ->from($db->quoteName('#__testquestions_results', 'r'))
                 ->leftJoin($db->quoteName('#__testquestions_sets', 's') . ' ON s.id = r.set_id')
                 ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
@@ -33,7 +35,7 @@ class ResultModel extends BaseDatabaseModel
         if ($ids) {
             $item->questions = $db->setQuery(
                 $db->getQuery(true)
-                    ->select(['id', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'points'])
+                    ->select(['id', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'points', 'image'])
                     ->from($db->quoteName('#__testquestions_questions'))
                     ->where('id IN (' . implode(',', $ids) . ')')
             )->loadObjectList('id');
@@ -72,4 +74,167 @@ 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'));
+        $provider = strtolower(preg_replace('/[^a-z]/', '', $provider));
+        $keyName = 'ai_' . $provider . '_api_key';
+        $apiKey = trim((string) $params->get($keyName, $params->get('ai_api_key', '')));
+        $componentKeyLength = mb_strlen($apiKey);
+        $defaultModels = ['openai' => 'gpt-4.1-mini', 'grok' => 'grok-4.7', 'groq' => 'openai/gpt-oss-120b', 'gemini' => 'gemini-3.8-flash'];
+        $model = trim((string) $params->get('ai_' . $provider . '_model', $defaultModels[$provider] ?? ''));
+
+        // 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;
+            }
+        }
+
+        $provider = strtolower(preg_replace('/[^a-z]/', '', $provider));
+        $keyName = 'ai_' . $provider . '_api_key';
+        $apiKey = trim((string) $params->get($keyName, $params->get('ai_api_key', '')));
+        $componentKeyLength = mb_strlen($apiKey);
+        $model = trim((string) (is_array($storedParams)
+            ? ($storedParams['ai_' . $provider . '_model'] ?? $params->get('ai_' . $provider . '_model', $defaultModels[$provider] ?? ''))
+            : $params->get('ai_' . $provider . '_model', $defaultModels[$provider] ?? '')));
+        if ($model === '') {
+            $model = $defaultModels[$provider] ?? '';
+        }
+        $storedApiKey = is_array($storedParams)
+            ? trim((string) ($storedParams[$keyName] ?? $storedParams['ai_api_key'] ?? ''))
+            : '';
+        if ($storedApiKey !== '' && !preg_match('/^\*+$/', $storedApiKey)) {
+            $apiKey = $storedApiKey;
+        }
+
+        if (trim($apiKey) === '') {
+            $databaseKey = $storedApiKey;
+            $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,
+            $model,
+            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'];
+        if ($aiResult['usage'] !== null) {
+            $history = $item->answers[$questionId]['ai_usage_history'] ?? null;
+            if (!is_array($history)) {
+                $history = !empty($item->answers[$questionId]['ai_usage']) && is_array($item->answers[$questionId]['ai_usage'])
+                    ? [$item->answers[$questionId]['ai_usage']]
+                    : [];
+            }
+            $history[] = $aiResult['usage'];
+            $item->answers[$questionId]['ai_usage_history'] = $history;
+            $item->answers[$questionId]['ai_usage'] = $aiResult['usage'];
+        }
+
+        $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']) && trim((string) ($answer['selected'] ?? '')) !== '') {
+                $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

@@ -9,6 +9,113 @@ use Joomla\CMS\MVC\Model\ListModel;
 
 class ResultsModel extends ListModel
 {
+    public function getItems()
+    {
+        $items = parent::getItems();
+
+        foreach ($items as $item) {
+            $item->has_assessment = false;
+            $item->ai_input_tokens = 0;
+            $item->ai_output_tokens = 0;
+            $item->ai_total_tokens = 0;
+            $item->ai_cost_usd = 0.0;
+            $item->ai_tokens_by_provider = ['openai' => 0, 'grok' => 0, 'groq' => 0, 'gemini' => 0];
+
+            $answers = json_decode((string) ($item->answers ?? ''), true);
+            if (!is_array($answers)) {
+                continue;
+            }
+
+            foreach ($answers as $answer) {
+                if (!is_array($answer)) {
+                    continue;
+                }
+
+                // Manual assessment and AI both save awarded_points in the answer JSON.
+                if (array_key_exists('awarded_points', $answer)) {
+                    $item->has_assessment = true;
+                }
+
+                $usages = $answer['ai_usage_history'] ?? (isset($answer['ai_usage']) ? [$answer['ai_usage']] : []);
+                if (!is_array($usages)) {
+                    continue;
+                }
+
+                foreach ($usages as $usage) {
+                    if (!is_array($usage)) {
+                        continue;
+                    }
+                    $item->ai_input_tokens += (int) ($usage['input_tokens'] ?? 0);
+                    $item->ai_output_tokens += (int) ($usage['output_tokens'] ?? 0);
+                    $item->ai_total_tokens += (int) ($usage['total_tokens'] ?? 0);
+                    $provider = (string) ($usage['provider'] ?? '');
+                    if (isset($item->ai_tokens_by_provider[$provider])) {
+                        $item->ai_tokens_by_provider[$provider] += (int) ($usage['total_tokens'] ?? 0);
+                    }
+                    if (is_numeric($usage['cost_usd'] ?? null)) {
+                        $item->ai_cost_usd += (float) $usage['cost_usd'];
+                    }
+                }
+            }
+        }
+
+        return $items;
+    }
+
+    public function getAiUsageTotals(): array
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $query = clone $this->getListQuery();
+        $query->clear('select')->clear('order')->select($db->quoteName('r.answers'));
+        $answersRows = $db->setQuery($query)->loadColumn();
+        $emptyProviderTotals = ['input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0];
+        $totals = [
+            'input_tokens' => 0,
+            'output_tokens' => 0,
+            'total_tokens' => 0,
+            'cost_usd' => 0.0,
+            'providers' => ['openai' => $emptyProviderTotals, 'grok' => $emptyProviderTotals, 'groq' => $emptyProviderTotals, 'gemini' => $emptyProviderTotals],
+        ];
+
+        foreach ($answersRows as $answersJson) {
+            $answers = json_decode((string) $answersJson, true);
+            if (!is_array($answers)) {
+                continue;
+            }
+            foreach ($answers as $answer) {
+                if (!is_array($answer)) {
+                    continue;
+                }
+                $usages = $answer['ai_usage_history'] ?? (isset($answer['ai_usage']) ? [$answer['ai_usage']] : []);
+                if (!is_array($usages)) {
+                    continue;
+                }
+                foreach ($usages as $usage) {
+                    if (!is_array($usage)) {
+                        continue;
+                    }
+                    $totals['input_tokens'] += (int) ($usage['input_tokens'] ?? 0);
+                    $totals['output_tokens'] += (int) ($usage['output_tokens'] ?? 0);
+                    $totals['total_tokens'] += (int) ($usage['total_tokens'] ?? 0);
+                    if (is_numeric($usage['cost_usd'] ?? null)) {
+                        $totals['cost_usd'] += (float) $usage['cost_usd'];
+                    }
+                    $provider = (string) ($usage['provider'] ?? '');
+                    if (isset($totals['providers'][$provider])) {
+                        $totals['providers'][$provider]['input_tokens'] += (int) ($usage['input_tokens'] ?? 0);
+                        $totals['providers'][$provider]['output_tokens'] += (int) ($usage['output_tokens'] ?? 0);
+                        $totals['providers'][$provider]['total_tokens'] += (int) ($usage['total_tokens'] ?? 0);
+                        if (is_numeric($usage['cost_usd'] ?? null)) {
+                            $totals['providers'][$provider]['cost_usd'] += (float) $usage['cost_usd'];
+                        }
+                    }
+                }
+            }
+        }
+
+        return $totals;
+    }
+
     protected function populateState($ordering = 'r.created', $direction = 'desc')
     {
         parent::populateState($ordering, $direction);

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

@@ -9,6 +9,26 @@ use Joomla\CMS\MVC\Model\AdminModel;
 
 class SetModel extends AdminModel
 {
+    public function publish(&$pks, $value = 1)
+    {
+        $ids = array_values(array_unique(array_filter(array_map('intval', (array) $pks))));
+        if (!parent::publish($pks, $value)) {
+            return false;
+        }
+
+        if ($ids) {
+            $db = Factory::getContainer()->get('DatabaseDriver');
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->update($db->quoteName('#__testquestions_sets'))
+                    ->set($db->quoteName('published') . ' = ' . (int) $value)
+                    ->where($db->quoteName('parent_id') . ' IN (' . implode(',', $ids) . ')')
+            )->execute();
+        }
+
+        return true;
+    }
+
     public function getTable($name = 'Set', $prefix = 'Administrator', $config = [])
     {
         return $this->getMVCFactory()->createTable($name, $prefix, $config);
@@ -136,6 +156,7 @@ class SetModel extends AdminModel
             $parent = $this->getItem($parentId);
             if ($parent) {
                 $data['duration'] = (int) $parent->duration;
+                $data['published'] = (int) $parent->published;
             }
         } elseif (!in_array(($data['set_type'] ?? 'ordinary'), ['ordinary', 'multi'], true)) {
             $data['set_type'] = 'ordinary';
@@ -151,6 +172,15 @@ class SetModel extends AdminModel
 
         $setId = (int) $this->getState($this->getName() . '.id');
         $db = Factory::getContainer()->get('DatabaseDriver');
+        if ($parentId === 0) {
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->update($db->quoteName('#__testquestions_sets'))
+                    ->set($db->quoteName('published') . ' = ' . (int) ($data['published'] ?? 1))
+                    ->where($db->quoteName('parent_id') . ' = ' . $setId)
+            )->execute();
+        }
+
         $db->setQuery(
             $db->getQuery(true)
                 ->delete($db->quoteName('#__testquestions_set_questions'))

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

@@ -0,0 +1,235 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Service;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Http\HttpFactory;
+
+class AiService
+{
+    public static function availableModels(): array
+    {
+        return [
+            'openai' => [
+                'gpt-4.1-mini' => 'GPT-4.1 mini (starszy)',
+                'gpt-5.6-luna' => 'GPT-5.6 Luna',
+                'gpt-5.6-terra' => 'GPT-5.6 Terra',
+                'gpt-5.6-sol' => 'GPT-5.6 Sol',
+                'gpt-6-luna' => 'GPT-6 Luna',
+            ],
+            'grok' => [
+                'grok-4.7' => 'Grok 4.7',
+                'grok-4.20' => 'Grok 4.20 Reasoning',
+                'grok-4.20-non-reasoning' => 'Grok 4.20 Non-Reasoning',
+            ],
+            'groq' => [
+                'openai/gpt-oss-120b' => 'GPT OSS 120B',
+                'openai/gpt-oss-20b' => 'GPT OSS 20B',
+                'llama-3.3-70b-versatile' => 'Llama 3.3 70B Versatile',
+            ],
+            'gemini' => [
+                'gemini-3.8-flash' => 'Gemini 3.8 Flash',
+                'gemini-3.1-pro-preview' => 'Gemini 3.1 Pro (Preview)',
+            ],
+        ];
+    }
+
+    public function evaluate(string $provider, string $apiKey, string $model, string $question, string $answer, string $pattern, int $maxPoints): array
+    {
+        $provider = strtolower(trim($provider));
+        $provider = preg_replace('/[^a-z]/', '', $provider);
+        $config = match ($provider) {
+            'grok' => ['url' => 'https://api.x.ai/v1/responses'],
+            'groq' => ['url' => 'https://api.groq.com/openai/v1/chat/completions'],
+            'gemini' => ['url' => 'https://generativelanguage.googleapis.com/v1beta/models/' . rawurlencode($model) . ':generateContent'],
+            default => ['url' => 'https://api.openai.com/v1/responses'],
+        };
+
+        if (trim($apiKey) === '') {
+            throw new \RuntimeException('AI_NOT_CONFIGURED');
+        }
+
+        if (!in_array($provider, ['openai', 'grok', 'groq', 'gemini'], true)) {
+            throw new \RuntimeException('Nieprawidłowy dostawca AI: ' . $provider);
+        }
+
+        if (!isset(self::availableModels()[$provider][$model])) {
+            throw new \RuntimeException('Wybrany model AI nie jest obsługiwany.');
+        }
+
+        $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.";
+
+        $requestData = match ($provider) {
+            'groq' => [
+                'model' => $model,
+                'messages' => [['role' => 'user', 'content' => $input]],
+                'temperature' => 0.1,
+            ],
+            'gemini' => [
+                'contents' => [['parts' => [['text' => $input]]]],
+                'generationConfig' => [
+                    'maxOutputTokens' => 256,
+                    'responseMimeType' => 'application/json',
+                    'thinkingConfig' => ['thinkingLevel' => 'low'],
+                ],
+            ],
+            default => [
+                'model' => $model,
+                'input' => $input,
+            ],
+        };
+        // GPT-5.x reasoning models do not accept a custom temperature.
+        if ($provider === 'grok' || ($provider === 'openai' && $model === 'gpt-4.1-mini')) {
+            $requestData['temperature'] = 0.1;
+        }
+        $payload = json_encode($requestData, JSON_UNESCAPED_UNICODE);
+
+        $headers = [
+            'Content-Type' => 'application/json',
+        ];
+        if ($provider === 'gemini') {
+            $headers['x-goog-api-key'] = trim($apiKey);
+        } else {
+            $headers['Authorization'] = 'Bearer ' . trim($apiKey);
+        }
+
+        $response = HttpFactory::getHttp()->post(
+            $config['url'],
+            $payload,
+            $headers,
+            $provider === 'gemini' ? 25 : 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.');
+        }
+
+        $actualModel = (string) ($body['model'] ?? $model);
+        $usage = $this->getUsage($body, $provider, $model);
+        if ($usage !== null) {
+            $usage['model'] = $actualModel;
+        }
+
+        return [
+            'awarded_points' => min(max(0, $maxPoints), max(0, (int) $result['awarded_points'])),
+            'feedback' => trim((string) ($result['feedback'] ?? '')),
+            'usage' => $usage,
+        ];
+    }
+
+    private function getUsage(array $body, string $provider, string $model): ?array
+    {
+        // Gemini uses camelCase UsageMetadata at the response root; the
+        // OpenAI-compatible providers return their counters in `usage`.
+        $usage = $body['usageMetadata'] ?? $body['usage'] ?? null;
+        if (!is_array($usage)) {
+            return null;
+        }
+
+        $inputTokens = max(0, (int) ($usage['input_tokens'] ?? $usage['prompt_tokens'] ?? $usage['promptTokenCount'] ?? 0));
+        $outputTokens = max(0, (int) ($usage['output_tokens'] ?? $usage['completion_tokens'] ?? (
+            (int) ($usage['candidatesTokenCount'] ?? 0) + (int) ($usage['thoughtsTokenCount'] ?? 0)
+        )));
+        if ((!isset($usage['input_tokens']) && !isset($usage['prompt_tokens']) && !isset($usage['promptTokenCount']))
+            || (!isset($usage['output_tokens']) && !isset($usage['completion_tokens']) && !isset($usage['candidatesTokenCount']))) {
+            return null;
+        }
+        $cachedTokens = min($inputTokens, max(0, (int) ($usage['input_tokens_details']['cached_tokens'] ?? $usage['cachedContentTokenCount'] ?? 0)));
+        $cost = null;
+        $costSource = '';
+
+        if ($provider === 'grok' && isset($usage['cost_in_usd_ticks']) && is_numeric($usage['cost_in_usd_ticks'])) {
+            $cost = (float) $usage['cost_in_usd_ticks'] / 10000000000;
+            $costSource = 'provider';
+        } elseif ($provider === 'openai' && isset($this->openAiRates()[$model])) {
+            [$inputRate, $cachedRate, $outputRate, $cacheWriteRate] = $this->openAiRates()[$model];
+            $uncachedTokens = $inputTokens - $cachedTokens;
+            $cacheWriteTokens = min($uncachedTokens, max(0, (int) ($usage['input_tokens_details']['cache_write_tokens'] ?? 0)));
+            $uncachedTokens -= $cacheWriteTokens;
+            $cost = ($uncachedTokens * $inputRate + $cachedTokens * $cachedRate + $cacheWriteTokens * $cacheWriteRate + $outputTokens * $outputRate) / 1000000;
+            $costSource = 'token_rates';
+        }
+
+        return [
+            'provider' => $provider,
+            'model' => $model,
+            'input_tokens' => $inputTokens,
+            'output_tokens' => $outputTokens,
+            'total_tokens' => (int) ($usage['total_tokens'] ?? $usage['totalTokenCount'] ?? ($inputTokens + $outputTokens)),
+            'cached_input_tokens' => $cachedTokens,
+            'cost_usd' => $cost,
+            'cost_source' => $costSource,
+        ];
+    }
+
+    private function openAiRates(): array
+    {
+        return [
+            'gpt-4.1-mini' => [0.40, 0.10, 1.60, 0.40],
+            'gpt-5.6-luna' => [0.20, 0.02, 1.20, 0.25],
+            'gpt-5.6-terra' => [2.00, 0.20, 12.00, 2.50],
+            'gpt-5.6-sol' => [4.00, 0.40, 20.00, 5.00],
+            'gpt-6-luna' => [0.10, 0.01, 0.50, 0.125],
+        ];
+    }
+
+    private function extractText(array $body): string
+    {
+        if (isset($body['candidates'][0]['content']['parts']) && is_array($body['candidates'][0]['content']['parts'])) {
+            $parts = [];
+            foreach ($body['candidates'][0]['content']['parts'] as $part) {
+                if (isset($part['text']) && is_string($part['text'])) {
+                    $parts[] = $part['text'];
+                }
+            }
+            return trim(implode("\n", $parts));
+        }
+
+        if (isset($body['choices'][0]['message']['content']) && is_string($body['choices'][0]['message']['content'])) {
+            return trim($body['choices'][0]['message']['content']);
+        }
+
+        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,84 @@
+<?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 = [];
+    protected array $usageTotals = [];
+
+    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) ?: [];
+        $this->usageTotals = [
+            'openai' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
+            'grok' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
+            'groq' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
+            'gemini' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
+        ];
+
+        $usageRows = $db->setQuery(
+            $db->getQuery(true)
+                ->select($db->quoteName('answers'))
+                ->from($db->quoteName('#__testquestions_results'))
+                ->where($db->quoteName('answers') . ' LIKE ' . $db->quote('%ai_usage%'))
+        )->loadColumn();
+
+        foreach ($usageRows as $answersJson) {
+            $answers = json_decode((string) $answersJson, true);
+            if (!is_array($answers)) {
+                continue;
+            }
+
+            foreach ($answers as $answer) {
+                if (!is_array($answer)) {
+                    continue;
+                }
+
+                $usages = $answer['ai_usage_history'] ?? (isset($answer['ai_usage']) ? [$answer['ai_usage']] : []);
+                if (!is_array($usages)) {
+                    continue;
+                }
+
+                foreach ($usages as $usage) {
+                    if (!is_array($usage)) {
+                        continue;
+                    }
+                    $provider = (string) ($usage['provider'] ?? '');
+                    if (!isset($this->usageTotals[$provider])) {
+                        continue;
+                    }
+
+                    $this->usageTotals[$provider]['calls']++;
+                    $this->usageTotals[$provider]['input_tokens'] += (int) ($usage['input_tokens'] ?? 0);
+                    $this->usageTotals[$provider]['output_tokens'] += (int) ($usage['output_tokens'] ?? 0);
+                    $this->usageTotals[$provider]['total_tokens'] += (int) ($usage['total_tokens'] ?? 0);
+                    if (is_numeric($usage['cost_usd'] ?? null)) {
+                        $this->usageTotals[$provider]['cost_usd'] += (float) $usage['cost_usd'];
+                        $this->usageTotals[$provider]['cost_calls']++;
+                    }
+                }
+            }
+        }
+
+        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/Preview/HtmlView.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Preview;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $items = [];
+    protected $set;
+
+    public function display($tpl = null)
+    {
+        $user = Factory::getApplication()->getIdentity();
+        if (!$user->authorise('core.edit', 'com_testquestions') && !$user->authorise('core.manage', 'com_testquestions')) {
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+        }
+
+        $this->items = $this->get('Items');
+        $this->set = $this->get('Set');
+        $this->getDocument()->getWebAssetManager()->registerAndUseStyle(
+            'com_testquestions.exam',
+            'media/com_testquestions/egzamin.css'
+        );
+        ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_PREVIEW_TITLE'));
+
+        if ($this->set) {
+            ToolbarHelper::link(
+                Route::_('index.php?option=com_testquestions&view=sets'),
+                'COM_TESTQUESTIONS_SETS',
+                'arrow-left'
+            );
+            ToolbarHelper::link(
+                Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $this->set->id),
+                'COM_TESTQUESTIONS_EDIT_SET',
+                'edit'
+            );
+        } else {
+            ToolbarHelper::link(
+                Route::_('index.php?option=com_testquestions&view=questions'),
+                'COM_TESTQUESTIONS',
+                'arrow-left'
+            );
+        }
+
+        return parent::display($tpl);
+    }
+}

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

@@ -41,6 +41,7 @@ class HtmlView extends BaseHtmlView
         }
         if ($user->authorise('core.edit', 'com_testquestions')) {
             ToolbarHelper::editList('question.edit', 'JTOOLBAR_EDIT');
+            ToolbarHelper::custom('questions.preview', 'eye', 'eye', 'COM_TESTQUESTIONS_PREVIEW_SELECTED', true);
         }
         if ($user->authorise('core.delete', 'com_testquestions')) {
             ToolbarHelper::deleteList('', 'questions.delete', 'JTOOLBAR_DELETE');
@@ -63,5 +64,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/Results/HtmlView.php

@@ -8,6 +8,7 @@ use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\CMS\Factory;
 
 class HtmlView extends BaseHtmlView
 {
@@ -15,6 +16,7 @@ class HtmlView extends BaseHtmlView
     protected $pagination;
     protected $state;
     protected $sets;
+    protected $aiUsageTotals;
 
     public function display($tpl = null)
     {
@@ -22,7 +24,11 @@ class HtmlView extends BaseHtmlView
         $this->pagination = $this->get('Pagination');
         $this->state = $this->get('State');
         $this->sets = $this->get('Sets');
+        $this->aiUsageTotals = $this->get('AiUsageTotals');
         ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULTS'));
+        if (Factory::getApplication()->getIdentity()->authorise('core.delete', 'com_testquestions')) {
+            ToolbarHelper::deleteList('', 'results.delete', 'JTOOLBAR_DELETE');
+        }
         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

@@ -47,6 +47,13 @@ class HtmlView extends BaseHtmlView
     protected function addToolbar()
     {
         ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SET') : Text::_('COM_TESTQUESTIONS_NEW_SET'));
+        if (!empty($this->item->id) && ((string) $this->item->set_type !== 'multi' || $this->isVariant)) {
+            ToolbarHelper::link(
+                'index.php?option=com_testquestions&view=preview&set_id=' . (int) $this->item->id,
+                'COM_TESTQUESTIONS_PREVIEW_SET',
+                'eye'
+            );
+        }
         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

@@ -15,6 +15,7 @@ class HtmlView extends BaseHtmlView
     protected $pagination;
     protected $state;
     protected $subjects;
+    protected $canUnpublishAll = false;
 
     public function display($tpl = null)
     {
@@ -22,6 +23,8 @@ class HtmlView extends BaseHtmlView
         $this->pagination = $this->get('Pagination');
         $this->state = $this->get('State');
         $this->subjects = $this->get('Subjects');
+        $user = $this->getCurrentUser();
+        $this->canUnpublishAll = $user->authorise('core.edit.state', 'com_testquestions') || $user->authorise('core.edit', 'com_testquestions');
 
         if (count($errors = $this->get('Errors'))) {
             throw new \RuntimeException(implode("\n", $errors));

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

@@ -0,0 +1,159 @@
+<?php defined('_JEXEC') or die; ?>
+<?php use Joomla\CMS\HTML\HTMLHelper; ?>
+<?php use Joomla\CMS\Router\Route; ?>
+<?php $availableModels = \Komponent\Component\Testquestions\Administrator\Service\AiService::availableModels(); ?>
+<?php $usageTotals = $this->usageTotals; ?>
+<?php $provider = (string) ($this->settings['ai_provider'] ?? 'openai'); ?>
+<?php $legacyKey = (string) ($this->settings['ai_api_key'] ?? ''); ?>
+<?php $openaiKey = (string) ($this->settings['ai_openai_api_key'] ?? ($provider === 'openai' ? $legacyKey : '')); ?>
+<?php $grokKey = (string) ($this->settings['ai_grok_api_key'] ?? ($provider === 'grok' ? $legacyKey : '')); ?>
+<?php $groqKey = (string) ($this->settings['ai_groq_api_key'] ?? ($provider === 'groq' ? $legacyKey : '')); ?>
+<?php $geminiKey = (string) ($this->settings['ai_gemini_api_key'] ?? ($provider === 'gemini' ? $legacyKey : '')); ?>
+<?php $openaiModel = (string) ($this->settings['ai_openai_model'] ?? 'gpt-4.1-mini'); ?>
+<?php $grokModel = (string) ($this->settings['ai_grok_model'] ?? 'grok-4.7'); ?>
+<?php $groqModel = (string) ($this->settings['ai_groq_model'] ?? 'openai/gpt-oss-120b'); ?>
+<?php $geminiModel = (string) ($this->settings['ai_gemini_model'] ?? 'gemini-3.8-flash'); ?>
+<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>
+                    <option value="groq" <?php echo $provider === 'groq' ? 'selected' : ''; ?>>Groq</option>
+                    <option value="gemini" <?php echo $provider === 'gemini' ? 'selected' : ''; ?>>Gemini</option>
+                </select>
+            </div>
+            <div class="mb-3" data-ai-provider-section="openai">
+                <label for="ai-openai-model" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_OPENAI_MODEL'); ?></label>
+                <select id="ai-openai-model" name="ai_openai_model" class="form-select" required>
+                    <?php foreach ($availableModels['openai'] as $modelId => $modelLabel) : ?>
+                        <option value="<?php echo htmlspecialchars($modelId, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $openaiModel === $modelId ? 'selected' : ''; ?>><?php echo htmlspecialchars($modelLabel, ENT_QUOTES, 'UTF-8'); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+            <div class="mb-3" data-ai-provider-section="openai">
+                <label for="ai-openai-api-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_OPENAI_KEY'); ?></label>
+                <div class="input-group">
+                    <input type="password" id="ai-openai-api-key" name="ai_openai_api_key" value="<?php echo htmlspecialchars($openaiKey, ENT_QUOTES, 'UTF-8'); ?>" class="form-control" size="120" maxlength="4096" autocomplete="new-password">
+                    <button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="ai-openai-api-key">Pokaż</button>
+                </div>
+                <small class="form-text text-muted">
+                    <?php echo $openaiKey !== '' ? 'Zapisany klucz: ' . mb_strlen($openaiKey) . ' znaków. Pozostaw pole bez zmian, aby go zachować.' : 'Nie zapisano klucza OpenAI.'; ?>
+                </small>
+            </div>
+            <div class="mb-3" data-ai-provider-section="grok">
+                <label for="ai-grok-api-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROK_KEY'); ?></label>
+                <div class="input-group">
+                    <input type="password" id="ai-grok-api-key" name="ai_grok_api_key" value="<?php echo htmlspecialchars($grokKey, ENT_QUOTES, 'UTF-8'); ?>" class="form-control" size="120" maxlength="4096" autocomplete="new-password">
+                    <button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="ai-grok-api-key">Pokaż</button>
+                </div>
+                <small class="form-text text-muted">
+                    <?php echo $grokKey !== '' ? 'Zapisany klucz: ' . mb_strlen($grokKey) . ' znaków. Pozostaw pole bez zmian, aby go zachować.' : 'Nie zapisano klucza Grok.'; ?>
+                </small>
+            </div>
+            <div class="mb-3" data-ai-provider-section="grok">
+                <label for="ai-grok-model" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROK_MODEL'); ?></label>
+                <select id="ai-grok-model" name="ai_grok_model" class="form-select" required>
+                    <?php foreach ($availableModels['grok'] as $modelId => $modelLabel) : ?>
+                        <option value="<?php echo htmlspecialchars($modelId, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $grokModel === $modelId ? 'selected' : ''; ?>><?php echo htmlspecialchars($modelLabel, ENT_QUOTES, 'UTF-8'); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+            <div class="mb-3" data-ai-provider-section="groq">
+                <label for="ai-groq-api-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROQ_KEY'); ?></label>
+                <div class="input-group">
+                    <input type="password" id="ai-groq-api-key" name="ai_groq_api_key" value="<?php echo htmlspecialchars($groqKey, ENT_QUOTES, 'UTF-8'); ?>" class="form-control" size="120" maxlength="4096" autocomplete="new-password">
+                    <button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="ai-groq-api-key">Pokaż</button>
+                </div>
+                <small class="form-text text-muted">
+                    <?php echo $groqKey !== '' ? 'Zapisany klucz: ' . mb_strlen($groqKey) . ' znaków. Pozostaw pole bez zmian, aby go zachować.' : 'Nie zapisano klucza Groq.'; ?>
+                </small>
+            </div>
+            <div class="mb-3" data-ai-provider-section="groq">
+                <label for="ai-groq-model" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROQ_MODEL'); ?></label>
+                <select id="ai-groq-model" name="ai_groq_model" class="form-select" required>
+                    <?php foreach ($availableModels['groq'] as $modelId => $modelLabel) : ?>
+                        <option value="<?php echo htmlspecialchars($modelId, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $groqModel === $modelId ? 'selected' : ''; ?>><?php echo htmlspecialchars($modelLabel, ENT_QUOTES, 'UTF-8'); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+            <div class="mb-3" data-ai-provider-section="gemini">
+                <label for="ai-gemini-api-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GEMINI_KEY'); ?></label>
+                <div class="input-group">
+                    <input type="password" id="ai-gemini-api-key" name="ai_gemini_api_key" value="<?php echo htmlspecialchars($geminiKey, ENT_QUOTES, 'UTF-8'); ?>" class="form-control" size="120" maxlength="4096" autocomplete="new-password">
+                    <button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="ai-gemini-api-key">Pokaż</button>
+                </div>
+                <small class="form-text text-muted">
+                    <?php echo $geminiKey !== '' ? 'Zapisany klucz: ' . mb_strlen($geminiKey) . ' znaków. Pozostaw pole bez zmian, aby go zachować.' : 'Nie zapisano klucza Gemini.'; ?>
+                </small>
+            </div>
+            <div class="mb-3" data-ai-provider-section="gemini">
+                <label for="ai-gemini-model" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GEMINI_MODEL'); ?></label>
+                <select id="ai-gemini-model" name="ai_gemini_model" class="form-select" required>
+                    <?php foreach ($availableModels['gemini'] as $modelId => $modelLabel) : ?>
+                        <option value="<?php echo htmlspecialchars($modelId, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $geminiModel === $modelId ? 'selected' : ''; ?>><?php echo htmlspecialchars($modelLabel, ENT_QUOTES, 'UTF-8'); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+            <hr>
+            <h3><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_TOKEN_USAGE'); ?></h3>
+            <p class="text-muted"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_TOKEN_USAGE_INFO'); ?></p>
+            <div class="table-responsive">
+                <table class="table table-striped">
+                    <thead>
+                        <tr>
+                            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_PROVIDER'); ?></th>
+                            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_CALLS'); ?></th>
+                            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_INPUT'); ?></th>
+                            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_OUTPUT'); ?></th>
+                            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_TOTAL'); ?></th>
+                            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_COST'); ?></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <?php foreach (['openai' => 'OpenAI', 'grok' => 'Grok', 'groq' => 'Groq', 'gemini' => 'Gemini'] as $usageProvider => $usageProviderLabel) : ?>
+                            <?php $providerUsage = $usageTotals[$usageProvider]; ?>
+                            <tr>
+                                <th><?php echo $usageProviderLabel; ?></th>
+                                <td><?php echo number_format($providerUsage['calls'], 0, ',', ' '); ?></td>
+                                <td><?php echo number_format($providerUsage['input_tokens'], 0, ',', ' '); ?></td>
+                                <td><?php echo number_format($providerUsage['output_tokens'], 0, ',', ' '); ?></td>
+                                <td><?php echo number_format($providerUsage['total_tokens'], 0, ',', ' '); ?></td>
+                                <td><?php echo $providerUsage['cost_calls'] > 0 ? number_format($providerUsage['cost_usd'], 8, ',', ' ') . ' USD' : '—'; ?></td>
+                            </tr>
+                        <?php endforeach; ?>
+                    </tbody>
+                </table>
+            </div>
+            <hr>
+            <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.querySelectorAll('[data-ai-key-toggle]').forEach(function (button) {
+    button.addEventListener('click', function () {
+        const input = document.getElementById(this.dataset.aiKeyToggle);
+        const visible = input.type === 'text';
+        input.type = visible ? 'password' : 'text';
+        this.textContent = visible ? 'Pokaż' : 'Ukryj';
+    });
+});
+const providerSelect = document.getElementById('ai-provider');
+const updateProviderFields = function () {
+    document.querySelectorAll('[data-ai-provider-section]').forEach(function (section) {
+        section.hidden = section.dataset.aiProviderSection !== providerSelect.value;
+    });
+};
+providerSelect.addEventListener('change', updateProviderFields);
+updateProviderFields();
+</script>

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

@@ -0,0 +1,69 @@
+<?php
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
+
+$resolveImageUrl = static function ($path) {
+    $path = trim((string) $path);
+
+    if ($path === '' || preg_match('#^https?://#i', $path)) {
+        return $path;
+    }
+
+    return Uri::root() . ltrim($path, '/');
+};
+?>
+<div class="com-testquestions egzamin">
+    <p class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_PREVIEW_READONLY'); ?></p>
+    <?php if ($this->set) : ?>
+        <header class="test-set-header">
+            <h1><?php echo htmlspecialchars($this->set->title, ENT_QUOTES, 'UTF-8'); ?></h1>
+            <?php if ($this->set->test_content) : ?><div class="test-set-content"><?php echo $this->set->test_content; ?></div><?php endif; ?>
+            <?php if ($this->set->image) : ?>
+                <div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($this->set->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div>
+            <?php endif; ?>
+        </header>
+    <?php endif; ?>
+    <?php if (!$this->items) : ?>
+        <div class="alert alert-warning"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_PREVIEW_EMPTY'); ?></div>
+    <?php else : ?>
+        <?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($resolveImageUrl($item->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div>
+                <?php endif; ?>
+                <?php if ($item->question_type === 'open') : ?>
+                    <div class="odp">
+                        <strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_PATTERN'); ?>:</strong>
+                        <?php echo htmlspecialchars((string) $item->answer_open, ENT_QUOTES, 'UTF-8'); ?>
+                    </div>
+                <?php else : ?>
+                    <ol type="A" class="answer-list">
+                        <?php foreach (['answer_a', 'answer_b', 'answer_c', 'answer_d'] as $answerIndex => $answerField) : ?>
+                            <?php $isCorrect = (int) $item->correct_answer === $answerIndex + 1; ?>
+                            <li class="<?php echo $isCorrect ? 'odpp' : 'odp'; ?>">
+                                <label>
+                                    <input type="radio" disabled <?php echo $isCorrect ? 'checked' : ''; ?>>
+                                    <strong><?php echo chr(65 + $answerIndex); ?>.</strong>
+                                    <span class="answer-text"><?php echo $item->$answerField; ?></span>
+                                    <?php if ($isCorrect) : ?><span class="text-success ms-1" title="<?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_ANSWER'); ?>">✓</span><?php endif; ?>
+                                </label>
+                            </li>
+                        <?php endforeach; ?>
+                    </ol>
+                <?php endif; ?>
+            </article>
+        <?php endforeach; ?>
+    <?php endif; ?>
+    <a class="btn btn-secondary" href="<?php echo $this->set ? Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $this->set->id) : Route::_('index.php?option=com_testquestions&view=questions'); ?>">
+        <?php echo $this->set ? \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_EDIT_SET') : \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_PREVIEW_BACK'); ?>
+    </a>
+</div>

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

@@ -1,7 +1,70 @@
 <?php defined('_JEXEC') or die; ?>
 <?php use Joomla\CMS\HTML\HTMLHelper; ?>
 <?php use Joomla\CMS\Router\Route; ?>
+<?php use Joomla\CMS\Uri\Uri; ?>
+<?php
+$resolveImageUrl = static function ($path) {
+    $path = trim((string) $path);
+
+    if ($path === '' || preg_match('#^(https?:)?//#i', $path)) {
+        return $path;
+    }
+
+    return Uri::root() . ltrim($path, '/');
+};
+?>
 <div class="container-fluid">
+    <div class="mb-3 no-print">
+        <button type="button" class="btn btn-outline-secondary" id="result-pdf-button">
+            <span class="icon-print" aria-hidden="true"></span>
+            <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_GENERATE_PDF'); ?>
+        </button>
+    </div>
+    <style>
+        .result-pdf-comment { display: none !important; }
+        @media print {
+            @page { size: A4; margin: 15mm; }
+            .no-print, .toolbar, #toolbar, .subhead, .sidebar-wrapper, #sidebar, .navbar,
+            #system-message-container, #adminForm input, #adminForm textarea,
+            #adminForm select, #adminForm button { display: none !important; }
+            body, .container-main, .container-fluid { background: #fff !important; width: 100% !important; margin: 0 !important; padding: 0 !important; }
+            .container-fluid { max-width: none !important; }
+            article { break-inside: auto; border-color: #aaa !important; }
+            img { max-width: 100% !important; max-height: 150mm; object-fit: contain; }
+            .alert { print-color-adjust: exact; -webkit-print-color-adjust: exact; }
+            .container-fluid .result-pdf-comment.has-print-comment { display: block !important; }
+            .result-pdf-comment-text { white-space: pre-wrap; }
+            .ai-token-info { display: none !important; }
+            .ai-feedback-screen.ai-feedback-print-source { display: block !important; }
+            .ai-feedback-screen.ai-feedback-print-source.print-ai-hidden { display: none !important; }
+            .ai-feedback-screen.ai-feedback-print-source > strong { display: none !important; }
+            .ai-feedback-screen.ai-feedback-print-source::before { content: "Komentarz:"; display: block; font-weight: bold; margin-bottom: .35em; }
+        }
+    </style>
+    <script>
+        document.addEventListener('DOMContentLoaded', function () {
+            document.getElementById('result-pdf-button')?.addEventListener('click', function () {
+                window.print();
+            });
+        });
+        window.addEventListener('beforeprint', function () {
+            document.querySelectorAll('.result-pdf-comment').forEach(function (commentBlock) {
+                const questionId = commentBlock.dataset.questionId;
+                let manualComment = document.getElementById('result-comment-' + questionId)?.value.trim() || '';
+                if (manualComment === '-' || manualComment === '—') {
+                    manualComment = '';
+                }
+                const output = commentBlock.querySelector('.result-pdf-comment-text');
+                const aiSource = document.querySelector('.ai-feedback-print-source[data-question-id="' + questionId + '"]');
+
+                commentBlock.classList.toggle('has-print-comment', Boolean(manualComment));
+                aiSource?.classList.toggle('print-ai-hidden', Boolean(manualComment));
+                if (output && manualComment) {
+                    output.textContent = manualComment;
+                }
+            });
+        });
+    </script>
     <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>
@@ -9,6 +72,7 @@
         </div>
         <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></dt>
         <dd class="col-sm-9"><?php echo $this->escape(($this->item->subject_title ? $this->item->subject_title . ' — ' : '') . $this->item->set_title); ?></dd>
+        <?php if (!empty($this->item->set_image)) : ?><dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_IMAGE'); ?></dt><dd class="col-sm-9"><img src="<?php echo htmlspecialchars($resolveImageUrl($this->item->set_image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy" style="max-width: 100%; height: auto;"></dd><?php endif; ?>
         <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_SCORE'); ?></dt>
         <dd class="col-sm-9"><?php echo (int) $this->item->correct_count; ?> / <?php echo (int) $this->item->total_count; ?> (<?php echo htmlspecialchars((string) $this->item->percentage, ENT_QUOTES, 'UTF-8'); ?>%)</dd>
         <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER'); ?></dt>
@@ -25,30 +89,115 @@
         <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">
+    <?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']) && trim((string) ($answer['selected'] ?? '')) !== '') { $pendingAiCount++; } ?>
+    <?php endforeach; ?>
+    <?php if ($pendingAiCount > 0) : ?>
+        <div class="mb-3 no-print">
+            <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>
+            <?php
+            $usageTotals = ['input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0, 'providers' => []];
+            foreach ($this->item->answers as $savedAnswer) {
+                $usage = $savedAnswer['ai_usage'] ?? null;
+                if (!is_array($usage)) continue;
+                $usageTotals['input_tokens'] += (int) ($usage['input_tokens'] ?? 0);
+                $usageTotals['output_tokens'] += (int) ($usage['output_tokens'] ?? 0);
+                $usageTotals['total_tokens'] += (int) ($usage['total_tokens'] ?? 0);
+                if (is_numeric($usage['cost_usd'] ?? null)) {
+                    $usageTotals['cost_usd'] += (float) $usage['cost_usd'];
+                    $usageTotals['cost_calls']++;
+                }
+                if (!empty($usage['provider'])) $usageTotals['providers'][(string) $usage['provider']] = true;
+            }
+            ?>
+            <?php if ($usageTotals['total_tokens'] > 0) : ?>
+                <?php $usageProviderLabels = array_map(static function ($usageProvider) { return ['openai' => 'OpenAI', 'grok' => 'Grok', 'groq' => 'Groq', 'gemini' => 'Gemini'][$usageProvider] ?? $usageProvider; }, array_keys($usageTotals['providers'])); ?>
+                <span class="badge text-bg-light border ms-2 ai-token-info" title="Suma dotychczasowych ocen AI">
+                    ✦ <?php echo implode(' + ', array_map('htmlspecialchars', $usageProviderLabels)); ?>:
+                    <?php echo number_format($usageTotals['total_tokens'], 0, ',', ' '); ?> tokenów,
+                    <?php echo $usageTotals['cost_calls'] > 0 ? number_format($usageTotals['cost_usd'], 8, ',', ' ') . ' USD' : 'koszt niedostępny'; ?>
+                </span>
+            <?php endif; ?>
+        </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; ?>
+        <?php $hasResponse = trim((string) ($answer['selected'] ?? '')) !== ''; ?>
+        <?php
+        $answerStatusCorrect = !empty($answer['correct']);
+        $answerStatusPartial = false;
+        if ($question->question_type === 'open' && array_key_exists('awarded_points', $answer)) {
+            $awardedPoints = (int) $answer['awarded_points'];
+            $maximumPoints = (int) ($question->points ?? 0);
+            $answerStatusCorrect = $awardedPoints > 0 && $awardedPoints >= $maximumPoints;
+            $answerStatusPartial = $awardedPoints > 0 && !$answerStatusCorrect;
+        }
+        $manualComment = trim((string) ($answer['comment'] ?? ''));
+        if ($manualComment === '-' || $manualComment === '—') {
+            $manualComment = '';
+        }
+        ?>
         <article class="mb-4 border rounded p-3">
             <div class="mb-2"><?php echo $question->question; ?></div>
+            <?php if (!empty($question->image)) : ?><div class="mb-3"><img src="<?php echo htmlspecialchars($resolveImageUrl($question->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy" style="max-width: 100%; height: auto;"></div><?php endif; ?>
             <?php if ($question->question_type === 'open') : ?>
                 <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_YOUR_ANSWER'); ?>:</strong> <?php echo htmlspecialchars($answer['selected'] ?: '—', ENT_QUOTES, 'UTF-8'); ?></div>
                 <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_PATTERN'); ?>:</strong> <?php echo htmlspecialchars($question->answer_open, ENT_QUOTES, 'UTF-8'); ?></div>
             <?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>
+            <div class="mt-2 <?php echo $answerStatusCorrect ? 'text-success' : ($answerStatusPartial ? 'text-warning' : 'text-danger'); ?>"><?php echo $answerStatusCorrect ? '✓ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_CORRECT') : ($answerStatusPartial ? '◐ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_PARTIALLY_CORRECT') : '✗ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_INCORRECT')); ?></div>
-            <?php if (empty($answer['correct'])) : ?>
+            <?php if ($question->question_type === 'open') : ?>
-                <div class="row mt-3">
+                <div class="result-pdf-comment mt-3" data-question-id="<?php echo (int) $questionId; ?>">
-                    <div class="col-md-3">
+                    <strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_COMMENT'); ?>:</strong><br>
-                        <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>
+                    <span class="result-pdf-comment-text"><?php echo htmlspecialchars($manualComment, ENT_QUOTES, 'UTF-8'); ?></span>
-                        <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; ?>
+            <?php if (empty($answer['correct'])) : ?>
+                <?php if ($question->question_type === 'open' && $hasResponse) : ?>
+                    <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>
+                        <?php if (!empty($answer['ai_usage']) && is_array($answer['ai_usage'])) : ?>
+                            <?php $usage = $answer['ai_usage']; ?>
+                            <?php $usageProvider = (string) ($usage['provider'] ?? ''); ?>
+                            <span class="badge text-bg-light border ms-2 ai-token-info" title="<?php echo $usageProvider === 'grok' ? 'Koszt zwrócony przez dostawcę' : (in_array($usageProvider, ['groq', 'gemini'], true) ? 'Dostawca zwrócił wykorzystane tokeny; koszt nie jest zwracany przez to API' : 'Koszt obliczony z faktycznie wykorzystanych tokenów i stawek modelu'); ?>">
+                                <?php echo $usageProvider === 'grok' ? '✦ Grok' : ($usageProvider === 'groq' ? '⚡ Groq' : ($usageProvider === 'gemini' ? '✧ Gemini' : '◉ OpenAI')); ?> ·
+                                <?php echo number_format((int) ($usage['input_tokens'] ?? 0), 0, ',', ' '); ?> in /
+                                <?php echo number_format((int) ($usage['output_tokens'] ?? 0), 0, ',', ' '); ?> out ·
+                                <?php echo is_numeric($usage['cost_usd'] ?? null) ? number_format((float) $usage['cost_usd'], 8, ',', ' ') . ' USD' : 'koszt niedostępny'; ?>
+                                <?php echo ($usage['cost_source'] ?? '') === 'token_rates' ? ' (wyliczony)' : ''; ?>
+                            </span>
+                        <?php endif; ?>
+                    </div>
+                    <?php if (!empty($answer['ai_feedback'])) : ?>
+                        <?php
+                        $aiPoints = (int) ($answer['awarded_points'] ?? 0);
+                        $maxPoints = (int) ($question->points ?? 0);
+                        $aiAlertClass = $aiPoints <= 0 ? 'alert-danger' : ($aiPoints >= $maxPoints ? 'alert-success' : 'alert-info');
+                        ?>
+                        <div class="alert <?php echo $aiAlertClass; ?> mt-3 ai-feedback-screen ai-feedback-print-source" data-question-id="<?php echo (int) $questionId; ?>"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_RESULT'); ?>:</strong><br><span class="ai-feedback-text"><?php echo nl2br(htmlspecialchars((string) $answer['ai_feedback'], ENT_QUOTES, 'UTF-8')); ?></span></div>
+                    <?php endif; ?>
+                <?php endif; ?>
+                <?php if ($question->question_type === 'open' && $hasResponse) : ?>
+                    <div class="row mt-3 no-print">
+                        <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; ?>
+            <?php endif; ?>
         </article>
     <?php endforeach; ?>
     <input type="hidden" name="task" value="result.save">

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

@@ -4,6 +4,7 @@ defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Router\Route;
+HTMLHelper::_('behavior.multiselect');
 ?>
 <form action="<?php echo Route::_('index.php?option=com_testquestions&view=results'); ?>" method="post" name="adminForm" id="adminForm">
     <div class="row mb-3">
@@ -33,36 +34,88 @@ use Joomla\CMS\Router\Route;
         </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>
+    <div class="alert alert-info" role="status">
+        <strong><?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_AI_TOKENS_TOTAL')); ?>:</strong>
+        <span class="d-block">
+            <strong>OpenAI:</strong>
+            <?php echo number_format((int) $this->aiUsageTotals['providers']['openai']['total_tokens'], 0, ',', ' '); ?> tokenów
+            (<?php echo number_format((int) $this->aiUsageTotals['providers']['openai']['input_tokens'], 0, ',', ' '); ?> wej. /
+            <?php echo number_format((int) $this->aiUsageTotals['providers']['openai']['output_tokens'], 0, ',', ' '); ?> wyj.)
+            <?php if ($this->aiUsageTotals['providers']['openai']['cost_usd'] > 0) : ?> · <?php echo number_format((float) $this->aiUsageTotals['providers']['openai']['cost_usd'], 8, ',', ' '); ?> USD<?php endif; ?>
+        </span>
+        <span class="d-block">
+            <strong>Grok:</strong>
+            <?php echo number_format((int) $this->aiUsageTotals['providers']['grok']['total_tokens'], 0, ',', ' '); ?> tokenów
+            (<?php echo number_format((int) $this->aiUsageTotals['providers']['grok']['input_tokens'], 0, ',', ' '); ?> wej. /
+            <?php echo number_format((int) $this->aiUsageTotals['providers']['grok']['output_tokens'], 0, ',', ' '); ?> wyj.)
+            <?php if ($this->aiUsageTotals['providers']['grok']['cost_usd'] > 0) : ?> · <?php echo number_format((float) $this->aiUsageTotals['providers']['grok']['cost_usd'], 8, ',', ' '); ?> USD<?php endif; ?>
+        </span>
+        <span class="d-block">
+            <strong>Groq:</strong>
+            <?php echo number_format((int) $this->aiUsageTotals['providers']['groq']['total_tokens'], 0, ',', ' '); ?> tokenów
+            (<?php echo number_format((int) $this->aiUsageTotals['providers']['groq']['input_tokens'], 0, ',', ' '); ?> wej. /
+            <?php echo number_format((int) $this->aiUsageTotals['providers']['groq']['output_tokens'], 0, ',', ' '); ?> wyj.)
+        </span>
+        <span class="d-block">
+            <strong>Gemini:</strong>
+            <?php echo number_format((int) $this->aiUsageTotals['providers']['gemini']['total_tokens'], 0, ',', ' '); ?> tokenów
+            (<?php echo number_format((int) $this->aiUsageTotals['providers']['gemini']['input_tokens'], 0, ',', ' '); ?> wej. /
+            <?php echo number_format((int) $this->aiUsageTotals['providers']['gemini']['output_tokens'], 0, ',', ' '); ?> wyj.)
+        </span>
+        <span class="d-block"><strong>Łącznie:</strong> <?php echo number_format((int) $this->aiUsageTotals['total_tokens'], 0, ',', ' '); ?> tokenów</span>
+    </div>
     <table class="table table-striped">
         <thead><tr>
+            <th class="w-1"><?php echo HTMLHelper::_('grid.checkall'); ?></th>
             <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>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_AI_TOKENS'); ?></th>
         </tr></thead>
         <tbody>
-        <?php foreach ($this->items as $item) : ?>
+        <?php foreach ($this->items as $i => $item) : ?>
             <tr class="<?php echo (int) $item->extra_time > 0 ? 'table-warning' : ''; ?>">
+                <td><?php echo HTMLHelper::_('grid.id', $i, $item->id); ?></td>
                 <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 if ($item->has_assessment) : ?>
-                <?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 $grade = 'NDST'; ?>
-                    <?php if ($pointsAfterPercentage >= $gradeScale[1]) { $grade = $gradeScale[0]; break; } ?>
+                    <?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 endforeach; ?>
+                        <?php if ($pointsAfterPercentage >= $gradeScale[1]) { $grade = $gradeScale[0]; break; } ?>
-                <td><?php echo (int) $item->points_before; ?> (<?php echo $pointsBeforePercentage; ?>%) / <?php echo (int) $item->points_after; ?> (<?php echo $pointsAfterPercentage; ?>%)</td>
+                    <?php endforeach; ?>
-                <td><?php echo $this->escape($grade); ?></td>
+                <?php endif; ?>
+                <td><?php echo (int) $item->points_before; ?> (<?php echo $pointsBeforePercentage; ?>%) / <?php if ($item->has_assessment) : ?><?php echo (int) $item->points_after; ?> (<?php echo $pointsAfterPercentage; ?>%)<?php else : ?><span class="text-muted"><?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_NOT_ASSESSED')); ?></span><?php endif; ?></td>
+                <td><?php echo $item->has_assessment ? $this->escape($grade) : '<span class="text-muted">' . $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_NOT_ASSESSED')) . '</span>'; ?></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>
+                <td>
+                    <?php if ($item->ai_total_tokens > 0) : ?>
+                        <small class="d-block text-muted">
+                            OpenAI: <?php echo number_format((int) $item->ai_tokens_by_provider['openai'], 0, ',', ' '); ?> ·
+                            Grok: <?php echo number_format((int) $item->ai_tokens_by_provider['grok'], 0, ',', ' '); ?> ·
+                            Groq: <?php echo number_format((int) $item->ai_tokens_by_provider['groq'], 0, ',', ' '); ?>
+                            · Gemini: <?php echo number_format((int) $item->ai_tokens_by_provider['gemini'], 0, ',', ' '); ?>
+                        </small>
+                        <small class="d-block text-muted">
+                            <?php echo number_format((int) $item->ai_total_tokens, 0, ',', ' '); ?> łącznie
+                            <?php if ($item->ai_cost_usd > 0) : ?> · <?php echo number_format((float) $item->ai_cost_usd, 8, ',', ' '); ?> USD<?php endif; ?>
+                        </small>
+                    <?php else : ?>
+                        —
+                    <?php endif; ?>
+                </td>
             </tr>
         <?php endforeach; ?>
         </tbody>
     </table>
     <?php echo $this->pagination->getListFooter(); ?>
+    <input type="hidden" name="boxchecked" value="0">
     <input type="hidden" name="task" value="">
     <?php echo HTMLHelper::_('form.token'); ?>
 </form>

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

@@ -8,6 +8,7 @@ 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) : ?>
@@ -27,7 +28,11 @@ HTMLHelper::_('behavior.formvalidator');
         <?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 ($this->isVariant) : ?>
+            <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANT_STATUS_INHERITED'); ?></div>
+        <?php else : ?>
+            <?php echo $this->form->renderField('published'); ?>
+        <?php endif; ?>
         <?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>
@@ -35,8 +40,13 @@ HTMLHelper::_('behavior.formvalidator');
                     <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>
-                                <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>
+                                    <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>
+                                </span>
+                                <a class="btn btn-sm btn-outline-secondary" href="<?php echo Route::_('index.php?option=com_testquestions&view=preview&set_id=' . (int) $variant->id); ?>">
+                                    <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_PREVIEW_SET'); ?>
+                                </a>
                             </li>
                         <?php endforeach; ?>
                     </ul>
@@ -51,10 +61,14 @@ HTMLHelper::_('behavior.formvalidator');
         <?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,16 +96,25 @@ HTMLHelper::_('behavior.formvalidator');
             <div class="mb-3">
                 <label for="set-question-category" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_CATEGORY_FILTER'); ?></label>
                 <select id="set-question-category" class="form-select">
+                    <option value="__choose" selected><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_CHOOSE_CATEGORY'); ?></option>
                     <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_ALL_CATEGORIES'); ?></option>
                     <?php foreach ($this->categories as $category) : ?>
                         <option value="<?php echo (int) $category->id; ?>"><?php echo $this->escape($category->title); ?></option>
                     <?php endforeach; ?>
                 </select>
             </div>
+            <div class="mb-3">
+                <label for="set-question-ids" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_ID_FILTER'); ?></label>
+                <input type="text" id="set-question-ids" class="form-control" placeholder="<?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_ID_FILTER_HINT')); ?>" inputmode="numeric">
+            </div>
+            <div class="form-check mb-2">
+                <input class="form-check-input" type="checkbox" id="set-question-select-visible">
+                <label class="form-check-label" for="set-question-select-visible"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SELECT_ALL_VISIBLE'); ?></label>
+            </div>
             <div id="set-available-question-list" class="border rounded p-3">
                 <?php foreach ($this->questions as $question) : ?>
                     <?php if (in_array((int) $question->id, array_map('intval', (array) $this->item->question_ids), true)) continue; ?>
-                    <div class="form-check set-available-question-row" data-category="<?php echo (int) $question->category_id; ?>">
+                    <div class="form-check set-available-question-row" data-category="<?php echo (int) $question->category_id; ?>" data-id="<?php echo (int) $question->id; ?>">
                         <input class="form-check-input" type="checkbox" name="jform[question_ids][]" value="<?php echo (int) $question->id; ?>" id="set-question-<?php echo (int) $question->id; ?>">
                         <label class="form-check-label" for="set-question-<?php echo (int) $question->id; ?>">
                             <span class="badge bg-secondary"><?php echo $this->escape($question->category_title ?: \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_UNCATEGORIZED')); ?></span>
@@ -125,21 +148,97 @@ HTMLHelper::_('behavior.formvalidator');
 </form>
 <script>
 document.addEventListener('DOMContentLoaded', function () {
-    const filter = document.getElementById('set-question-category');
+    const list = document.getElementById('set-selected-question-list');
-    const rows = document.querySelectorAll('.set-available-question-row');
 
-    if (!filter) {
+    if (!list || list.dataset.sortable !== '1') {
         return;
     }
 
-    filter.addEventListener('change', function () {
+    let dragged = null;
-        rows.forEach(function (row) {
+
-            row.classList.toggle('d-none', filter.value !== '' && row.dataset.category !== filter.value);
+    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 idFilter = document.getElementById('set-question-ids');
+    const selectVisible = document.getElementById('set-question-select-visible');
+    const rows = document.querySelectorAll('.set-available-question-row');
+
+    if (!filter || !idFilter || !selectVisible) {
+        return;
+    }
+
+    const visibleRows = function () {
+        return Array.from(rows).filter(function (row) { return !row.classList.contains('d-none'); });
+    };
+
+    const updateSelectVisible = function () {
+        const checkboxes = visibleRows().map(function (row) { return row.querySelector('input[type="checkbox"]'); });
+        const checkedCount = checkboxes.filter(function (checkbox) { return checkbox.checked; }).length;
+        selectVisible.checked = checkboxes.length > 0 && checkedCount === checkboxes.length;
+        selectVisible.indeterminate = checkedCount > 0 && checkedCount < checkboxes.length;
+        selectVisible.disabled = checkboxes.length === 0;
+    };
+
+    const applyFilters = function () {
+        const requestedIds = idFilter.value
+            .split(',')
+            .map(function (value) { return value.trim(); })
+            .filter(function (value) { return value !== ''; });
+
+        rows.forEach(function (row) {
+            const matchesCategory = filter.value !== '__choose' && (filter.value === '' || row.dataset.category === filter.value);
+            const matchesId = requestedIds.length === 0 || requestedIds.includes(row.dataset.id);
+            row.classList.toggle('d-none', !matchesCategory || !matchesId);
+        });
+        updateSelectVisible();
+    };
+
+    filter.addEventListener('change', applyFilters);
+    idFilter.addEventListener('input', applyFilters);
+    selectVisible.addEventListener('change', function () {
+        visibleRows().forEach(function (row) {
+            row.querySelector('input[type="checkbox"]').checked = selectVisible.checked;
+        });
+        updateSelectVisible();
+    });
+    rows.forEach(function (row) {
+        row.querySelector('input[type="checkbox"]').addEventListener('change', updateSelectVisible);
+    });
+    applyFilters();
+});
+</script>
+<script>
 document.addEventListener('DOMContentLoaded', function () {
     const duration = document.getElementById('jform_duration');
     const output = document.getElementById('set-duration-value');

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

@@ -30,6 +30,11 @@ HTMLHelper::_('behavior.multiselect');
         <div class="col-md-3">
             <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button>
             <a href="<?php echo Route::_('index.php?option=com_testquestions&view=sets'); ?>" class="btn btn-secondary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_CLEAR'); ?></a>
+            <?php if ($this->canUnpublishAll) : ?>
+                <button type="submit" class="btn btn-warning" data-confirm="<?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL_CONFIRM')); ?>" onclick="if (!confirm(this.dataset.confirm)) { return false; } this.form.task.value='sets.unpublishall';">
+                    <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL'); ?>
+                </button>
+            <?php endif; ?>
         </div>
     </div>
 
@@ -49,7 +54,12 @@ 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 (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>
+                <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; ?>
+                    <?php if ($item->set_type === 'ordinary') : ?>
+                        <a class="btn btn-sm btn-outline-secondary ms-2" href="<?php echo Route::_('index.php?option=com_testquestions&view=preview&set_id=' . (int) $item->id); ?>"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_PREVIEW_SET'); ?></a>
+                    <?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>

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.39.0</version>
+    <version>1.43.42</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

@@ -10,6 +10,7 @@ use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 class SetModel extends BaseDatabaseModel
 {
     protected $resolvedSetId;
+    protected $randomizeQuestions = true;
 
     protected function getSetId(): int
     {
@@ -44,6 +45,7 @@ class SetModel extends BaseDatabaseModel
         }
 
         $this->resolvedSetId = $setId;
+        $this->randomizeQuestions = $set->set_type !== 'multi';
 
         if ($set->set_type === 'multi') {
             $variantId = (int) $db->setQuery(
@@ -74,15 +76,16 @@ class SetModel extends BaseDatabaseModel
             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', 'q.time_limit'])
-                ->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()

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

@@ -25,6 +25,26 @@ class HtmlView extends BaseHtmlView
         $this->items = $this->get('Items');
         $this->sets = $this->get('Sets');
         $input = Factory::getApplication()->getInput();
+        if ($input->getCmd('task') === 'check' && $input->getMethod() === 'POST' && $this->items) {
+            $submittedQuestionOrder = array_map('intval', (array) $input->post->get('question_order', [], 'array'));
+            $expectedQuestionIds = array_map(static function ($item) {
+                return (int) $item->id;
+            }, $this->items);
+            $sortedSubmittedOrder = $submittedQuestionOrder;
+            $sortedExpectedIds = $expectedQuestionIds;
+            sort($sortedSubmittedOrder);
+            sort($sortedExpectedIds);
+
+            if ($sortedSubmittedOrder === $sortedExpectedIds) {
+                $itemsById = [];
+                foreach ($this->items as $item) {
+                    $itemsById[(int) $item->id] = $item;
+                }
+                $this->items = array_values(array_map(static function ($questionId) use ($itemsById) {
+                    return $itemsById[$questionId];
+                }, $submittedQuestionOrder));
+            }
+        }
         $this->started = $input->getMethod() === 'POST'
             && $input->post->getString('participant_name', '') !== ''
             && $input->post->getInt('set_id', 0) > 0;
@@ -51,6 +71,7 @@ class HtmlView extends BaseHtmlView
         }
 
         $answers = (array) $input->post->get('answers', [], 'array');
+        $submittedAnswerOrder = (array) $input->post->get('answer_order', [], 'array');
         $results = [];
         $correct = 0;
 
@@ -70,6 +91,14 @@ class HtmlView extends BaseHtmlView
                 $isCorrect = (string) $item->correct_answer === $selected;
             }
 
+            $answerOrder = array_map('intval', explode(',', (string) ($submittedAnswerOrder[$item->id] ?? '')));
+            sort($answerOrder);
+            if ($item->question_type !== 'closed' || $answerOrder !== [1, 2, 3, 4]) {
+                $answerOrder = [1, 2, 3, 4];
+            } else {
+                $answerOrder = array_map('intval', explode(',', (string) $submittedAnswerOrder[$item->id]));
+            }
+
             if ($isCorrect) {
                 $correct++;
             }
@@ -78,6 +107,7 @@ class HtmlView extends BaseHtmlView
                 'selected' => $selected,
                 'correct' => $isCorrect,
                 'points' => (int) ($item->points ?? 0),
+                'answer_order' => $answerOrder,
             ];
         }
 

components/com_testquestions/tmpl/questions/default.php

@@ -3,6 +3,17 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Uri\Uri;
+
+$resolveImageUrl = static function ($path) {
+    $path = trim((string) $path);
+
+    if ($path === '' || preg_match('#^https?://#i', $path)) {
+        return $path;
+    }
+
+    return Uri::root() . ltrim($path, '/');
+};
 ?>
 <div class="com-testquestions egzamin">
     <h1><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS'); ?></h1>
@@ -43,7 +54,7 @@ use Joomla\CMS\HTML\HTMLHelper;
                 </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>
+                <div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($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'; ?>">

components/com_testquestions/tmpl/set/default.php

@@ -3,6 +3,19 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Uri\Uri;
+
+$testDurationSeconds = 0;
+
+$resolveImageUrl = static function ($path) {
+    $path = trim((string) $path);
+
+    if ($path === '' || preg_match('#^https?://#i', $path)) {
+        return $path;
+    }
+
+    return Uri::root() . ltrim($path, '/');
+};
 ?>
 <div class="com-testquestions egzamin">
     <?php if (!$this->started) : ?>
@@ -39,16 +52,26 @@ use Joomla\CMS\Factory;
     <?php elseif (!$this->set) : ?>
         <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_NOT_FOUND'); ?></div>
     <?php else : ?>
+        <?php
+        $extraTime = Factory::getApplication()->getInput()->post->getInt('extra_time', 0);
+        $baseDurationSeconds = (int) $this->set->duration > 0
+            ? (int) $this->set->duration * 60
+            : array_sum(array_map(static function ($item) {
+                return max(0, (int) ($item->time_limit ?? 0));
+            }, $this->items));
+        $testDurationSeconds = $baseDurationSeconds + ($extraTime * 60);
+        $durationMinutes = intdiv($testDurationSeconds, 60);
+        $durationRemainder = $testDurationSeconds % 60;
+        ?>
         <header class="test-set-header">
             <?php if ($this->set->subject_title) : ?><div class="text-muted"><?php echo htmlspecialchars($this->set->subject_title, ENT_QUOTES, 'UTF-8'); ?></div><?php endif; ?>
             <h1><?php echo htmlspecialchars($this->set->title, ENT_QUOTES, 'UTF-8'); ?></h1>
-            <?php $extraTime = Factory::getApplication()->getInput()->post->getInt('extra_time', 0); ?>
+            <?php if ($testDurationSeconds > 0) : ?><div class="small text-muted"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_DURATION'); ?>: <?php echo $durationMinutes; ?> min<?php if ($durationRemainder > 0) : ?> <?php echo $durationRemainder; ?> s<?php endif; ?></div><?php endif; ?>
-            <?php if ((int) $this->set->duration > 0) : ?><div class="small text-muted"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_DURATION'); ?>: <?php echo (int) $this->set->duration + $extraTime; ?> min</div><?php endif; ?>
-            <?php if ($this->set->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($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; ?>
+            <?php if ($this->set->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($this->set->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
         </header>
-        <?php if (!$this->results && ((int) $this->set->duration + $extraTime) > 0) : ?>
+        <?php if (!$this->results && $testDurationSeconds > 0) : ?>
-            <div class="timer-container mb-4" id="test-timer-container" data-duration="<?php echo ((int) $this->set->duration + $extraTime) * 60; ?>" aria-live="polite">
+            <div class="timer-container mb-4" id="test-timer-container" data-duration="<?php echo $testDurationSeconds; ?>" aria-live="polite">
                 <svg width="120" height="120" viewBox="0 0 120 120" aria-hidden="true">
                     <circle cx="60" cy="60" r="54" fill="none" stroke="#dfe3e7" stroke-width="8"></circle>
                     <circle id="test-timer-ring" class="progress-ring__circle" cx="60" cy="60" r="54" fill="none" stroke="#4a86cf" stroke-width="8" stroke-linecap="round"></circle>
@@ -61,10 +84,21 @@ use Joomla\CMS\Factory;
         <?php endif; ?>
         <?php if ($this->items) : ?>
             <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="post" id="test-form">
+            <?php if (!$this->results) : ?>
+                <?php foreach ($this->items as $item) : ?><input type="hidden" name="question_order[]" value="<?php echo (int) $item->id; ?>"><?php endforeach; ?>
+            <?php endif; ?>
             <?php foreach ($this->items as $number => $item) : ?>
+                <?php
+                $answerOrder = $this->results && !empty($this->results['items'][$item->id]['answer_order'])
+                    ? $this->results['items'][$item->id]['answer_order']
+                    : [1, 2, 3, 4];
+                if (!$this->results && $item->question_type === 'closed') {
+                    shuffle($answerOrder);
+                }
+                ?>
                 <article class="testquestion mb-4">
                     <div class="pyt"><div class="question-header"><span class="question-number"><?php echo ($number + 1) . '.'; ?></span><div class="question-text"><?php echo $item->question; ?></div></div></div>
-                    <?php if ($item->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($item->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
+                    <?php if ($item->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($item->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
                     <?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) : ?>
@@ -76,12 +110,14 @@ use Joomla\CMS\Factory;
                             <?php endif; ?>
                         </div>
                     <?php else : ?>
+                        <?php if (!$this->results) : ?><input type="hidden" name="answer_order[<?php echo (int) $item->id; ?>]" value="<?php echo htmlspecialchars(implode(',', $answerOrder), ENT_QUOTES, 'UTF-8'); ?>"><?php endif; ?>
                         <ol type="A" class="answer-list">
-                        <?php foreach (['answer_a', 'answer_b', 'answer_c', 'answer_d'] as $answerIndex => $answerField) : ?>
+                        <?php foreach ($answerOrder as $displayIndex => $optionValue) : ?>
-                            <?php $isSelected = $this->results && $this->results['items'][$item->id]['selected'] === (string) ($answerIndex + 1); ?>
+                            <?php $answerField = 'answer_' . chr(96 + (int) $optionValue); ?>
-                            <?php $isCorrectAnswer = $this->results && (string) $item->correct_answer === (string) ($answerIndex + 1); ?>
+                            <?php $isSelected = $this->results && $this->results['items'][$item->id]['selected'] === (string) $optionValue; ?>
+                            <?php $isCorrectAnswer = $this->results && (string) $item->correct_answer === (string) $optionValue; ?>
                             <li class="<?php echo $isSelected && $this->results['items'][$item->id]['correct'] ? 'odpup' : ($isSelected ? 'odpu' : ($isCorrectAnswer ? 'odpp' : 'odp')); ?>">
-                                <label><input type="radio" name="answers[<?php echo (int) $item->id; ?>]" value="<?php echo $answerIndex + 1; ?>" <?php echo $isSelected ? 'checked' : ''; ?>><strong><?php echo chr(65 + $answerIndex); ?>.</strong> <span class="answer-text"><?php echo $item->$answerField; ?></span></label>
+                                <label><input type="radio" name="answers[<?php echo (int) $item->id; ?>]" value="<?php echo (int) $optionValue; ?>" <?php echo $isSelected ? 'checked' : ''; ?>><strong><?php echo chr(65 + $displayIndex); ?>.</strong> <span class="answer-text"><?php echo $item->$answerField; ?></span></label>
                             </li>
                         <?php endforeach; ?>
                         </ol>
@@ -107,7 +143,7 @@ use Joomla\CMS\Factory;
         <?php endif; ?>
     <?php endif; ?>
 </div>
-<?php if ($this->started && !$this->results && ((int) $this->set->duration + $extraTime) > 0) : ?>
+<?php if ($this->started && !$this->results && $testDurationSeconds > 0) : ?>
 <script>
 document.addEventListener('DOMContentLoaded', function () {
     const container = document.getElementById('test-timer-container');