Color AI feedback by awarded points

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

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"
@@ -62,6 +65,7 @@ COM_TESTQUESTIONS_SET_REORDER_INFO="Przeciągnij pytania, aby zmienić ich kolej
 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"
@@ -77,6 +81,13 @@ 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."
@@ -94,6 +105,10 @@ 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"

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

@@ -17,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')
@@ -35,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');
@@ -202,7 +202,7 @@ class ResultModel extends BaseDatabaseModel
         $questionIds = [];
         foreach ($item->answers as $questionId => $answer) {
             $question = $item->questions[(int) $questionId] ?? null;
-            if ($question && $question->question_type === 'open' && empty($answer['correct'])) {
+            if ($question && $question->question_type === 'open' && empty($answer['correct']) && trim((string) ($answer['selected'] ?? '')) !== '') {
                 $questionIds[] = (int) $questionId;
             }
         }

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

@@ -18,6 +18,7 @@ class ResultsModel extends ListModel
             $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];
 
             $answers = json_decode((string) ($item->answers ?? ''), true);
             if (!is_array($answers)) {
@@ -41,6 +42,10 @@ class ResultsModel extends ListModel
                     $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'];
                     }
@@ -57,7 +62,14 @@ class ResultsModel extends ListModel
         $query = clone $this->getListQuery();
         $query->clear('select')->clear('order')->select($db->quoteName('r.answers'));
         $answersRows = $db->setQuery($query)->loadColumn();
-        $totals = ['input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0];
+        $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],
+        ];
 
         foreach ($answersRows as $answersJson) {
             $answers = json_decode((string) $answersJson, true);
@@ -82,6 +94,15 @@ class ResultsModel extends ListModel
                     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'];
+                        }
+                    }
                 }
             }
         }

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/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');

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/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->image) : ?>
+                <div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($this->set->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div>
+            <?php endif; ?>
+            <?php if ($this->set->test_content) : ?><div class="test-set-content"><?php echo $this->set->test_content; ?></div><?php endif; ?>
+        </header>
+    <?php 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,6 +1,18 @@
 <?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">
     <dl class="row">
         <div class="row"<?php echo (int) $this->item->extra_time > 0 ? ' style="background-color: #fff3cd;"' : ''; ?>>
@@ -9,6 +21,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>
@@ -28,7 +41,7 @@
     <?php $pendingAiCount = 0; ?>
     <?php foreach ($this->item->answers as $questionId => $answer) : ?>
         <?php $candidate = $this->item->questions[(int) $questionId] ?? null; ?>
-        <?php if ($candidate && $candidate->question_type === 'open' && empty($answer['correct'])) { $pendingAiCount++; } ?>
+        <?php if ($candidate && $candidate->question_type === 'open' && empty($answer['correct']) && trim((string) ($answer['selected'] ?? '')) !== '') { $pendingAiCount++; } ?>
     <?php endforeach; ?>
     <?php if ($pendingAiCount > 0) : ?>
         <div class="mb-3">
@@ -59,8 +72,10 @@
     <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'] ?? '')) !== ''; ?>
         <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>
@@ -69,7 +84,7 @@
             <?php endif; ?>
             <div class="mt-2 <?php echo !empty($answer['correct']) ? 'text-success' : 'text-danger'; ?>"><?php echo !empty($answer['correct']) ? '✓ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_CORRECT') : '✗ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_INCORRECT'); ?></div>
             <?php if (empty($answer['correct'])) : ?>
-                <?php if ($question->question_type === 'open') : ?>
+                <?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'); ?>
@@ -87,10 +102,15 @@
                         <?php endif; ?>
                     </div>
                     <?php if (!empty($answer['ai_feedback'])) : ?>
-                        <div class="alert alert-info mt-3"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_RESULT'); ?>:</strong><br><?php echo nl2br(htmlspecialchars((string) $answer['ai_feedback'], ENT_QUOTES, 'UTF-8')); ?></div>
+                        <?php
+                        $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"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_RESULT'); ?>:</strong><br><?php echo nl2br(htmlspecialchars((string) $answer['ai_feedback'], ENT_QUOTES, 'UTF-8')); ?></div>
                     <?php endif; ?>
                 <?php endif; ?>
-                <?php if ($question->question_type === 'open') : ?>
+                <?php if ($question->question_type === 'open' && $hasResponse) : ?>
                     <div class="row mt-3">
                         <div class="col-md-3">
                             <label for="awarded-points-<?php echo (int) $questionId; ?>" class="form-label"><?php echo \Joomla\CMS\Language\Text::sprintf('COM_TESTQUESTIONS_RESULT_AWARDED_POINTS', (int) ($question->points ?? 0)); ?></label>

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

@@ -34,13 +34,22 @@ use Joomla\CMS\Router\Route;
         <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 \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_AI_TOKENS_TOTAL'); ?>:</strong>
-        <?php echo number_format((int) $this->aiUsageTotals['total_tokens'], 0, ',', ' '); ?> <?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_TOTAL')); ?>
-        (<?php echo number_format((int) $this->aiUsageTotals['input_tokens'], 0, ',', ' '); ?> in /
-        <?php echo number_format((int) $this->aiUsageTotals['output_tokens'], 0, ',', ' '); ?> out)
-        <?php if ($this->aiUsageTotals['cost_usd'] > 0) : ?>
-            · <?php echo number_format((float) $this->aiUsageTotals['cost_usd'], 8, ',', ' '); ?> USD
-        <?php endif; ?>
+        <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>Łącznie:</strong> <?php echo number_format((int) $this->aiUsageTotals['total_tokens'], 0, ',', ' '); ?> tokenów</span>
     </div>
     <table class="table table-striped">
         <thead><tr>
@@ -70,10 +79,12 @@ use Joomla\CMS\Router\Route;
                 <td><?php echo HTMLHelper::_('date', $item->created, 'Y-m-d H:i'); ?></td>
                 <td>
                     <?php if ($item->ai_total_tokens > 0) : ?>
-                        <?php echo number_format((int) $item->ai_total_tokens, 0, ',', ' '); ?> <?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_TOTAL')); ?>
                         <small class="d-block text-muted">
-                            <?php echo number_format((int) $item->ai_input_tokens, 0, ',', ' '); ?> in /
-                            <?php echo number_format((int) $item->ai_output_tokens, 0, ',', ' '); ?> out
+                            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, ',', ' '); ?>
+                        </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 : ?>

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

@@ -28,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>
@@ -36,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 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 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>
@@ -87,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>
@@ -172,17 +190,52 @@ document.addEventListener('DOMContentLoaded', function () {
 <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) {
+    if (!filter || !idFilter || !selectVisible) {
         return;
     }
 
-    filter.addEventListener('change', function () {
+    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) {
-            row.classList.toggle('d-none', filter.value !== '' && row.dataset.category !== filter.value);
+            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>

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

components/com_testquestions/src/Model/SetModel.php

@@ -77,7 +77,7 @@ class SetModel extends BaseDatabaseModel
         }
 
         $query = $db->getQuery(true)
-                ->select(['q.id', 'q.question_type', 'q.question', 'q.answer_a', 'q.answer_b', 'q.answer_c', 'q.answer_d', 'q.answer_open', 'q.correct_answer', 'q.points', 'q.image'])
+                ->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'])
                 ->from($db->quoteName('#__testquestions_set_questions', 'sq'))
                 ->innerJoin($db->quoteName('#__testquestions_questions', 'q') . ' ON q.id = sq.question_id')
                 ->where('sq.set_id = ' . $setId)

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 ((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 ($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 ($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; ?>
             <?php if ($this->set->test_content) : ?><div class="test-set-content"><?php echo $this->set->test_content; ?></div><?php endif; ?>
         </header>
-        <?php if (!$this->results && ((int) $this->set->duration + $extraTime) > 0) : ?>
-            <div class="timer-container mb-4" id="test-timer-container" data-duration="<?php echo ((int) $this->set->duration + $extraTime) * 60; ?>" aria-live="polite">
+        <?php if (!$this->results && $testDurationSeconds > 0) : ?>
+            <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 $isSelected = $this->results && $this->results['items'][$item->id]['selected'] === (string) ($answerIndex + 1); ?>
-                            <?php $isCorrectAnswer = $this->results && (string) $item->correct_answer === (string) ($answerIndex + 1); ?>
+                        <?php foreach ($answerOrder as $displayIndex => $optionValue) : ?>
+                            <?php $answerField = 'answer_' . chr(96 + (int) $optionValue); ?>
+                            <?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');