Remove questions from parent multi-variant sets

README.md

@@ -16,6 +16,7 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - zegar odliczający czas testu i automatyczne zakończenie po jego upływie,
 - zapisywanie wyników testów i zaznaczonych odpowiedzi w bazie danych,
 - podgląd zapisanych testów w panelu administratora,
+- zapisywanie i wyświetlanie czasu wykonania testu,
 - pozycję menu „Arkusz egzaminacyjny” z opcjonalnym symbolem arkusza,
 - listę wyboru dostępnych symboli arkuszy na stronie klienckiej,
 - możliwość rozwiązania arkusza i wyświetlenia wyniku oraz odpowiedzi poprawnych i zaznaczonych,
@@ -29,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.18.0).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.36.0).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/forms/set.xml

@@ -2,7 +2,13 @@
 <form>
     <fieldset name="details">
         <field name="id" type="hidden" />
+        <field name="parent_id" type="hidden" default="0" />
         <field name="title" type="text" label="COM_TESTQUESTIONS_SET_TITLE" required="true" maxlength="255" />
+        <field name="set_type" type="list" label="COM_TESTQUESTIONS_SET_TYPE" default="ordinary" required="true">
+            <option value="ordinary">COM_TESTQUESTIONS_SET_TYPE_ORDINARY</option>
+            <option value="multi">COM_TESTQUESTIONS_SET_TYPE_MULTI</option>
+            <option value="variant">COM_TESTQUESTIONS_SET_TYPE_VARIANT</option>
+        </field>
         <field name="subject_id" type="sql" label="COM_TESTQUESTIONS_SUBJECT" required="true" query="SELECT id, title FROM #__testquestions_subjects WHERE published = 1 ORDER BY title ASC" key_field="id" value_field="title" translate_query="false">
             <option value="0">COM_TESTQUESTIONS_SELECT_SUBJECT</option>
         </field>

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

@@ -49,6 +49,15 @@ COM_TESTQUESTIONS_SETS="Zestawy pytań"
 COM_TESTQUESTIONS_NEW_SET="Nowy zestaw pytań"
 COM_TESTQUESTIONS_EDIT_SET="Edytuj zestaw pytań"
 COM_TESTQUESTIONS_SET_TITLE="Nazwa zestawu"
+COM_TESTQUESTIONS_SET_TYPE="Rodzaj zestawu"
+COM_TESTQUESTIONS_SET_TYPE_ORDINARY="Zwykły zestaw"
+COM_TESTQUESTIONS_SET_TYPE_MULTI="Zestaw wielowariantowy"
+COM_TESTQUESTIONS_SET_TYPE_VARIANT="Wariant zestawu"
+COM_TESTQUESTIONS_SET_VARIANTS="Warianty zestawu"
+COM_TESTQUESTIONS_SET_ADD_VARIANT="Dodaj wariant"
+COM_TESTQUESTIONS_SET_PARENT="Zestaw nadrzędny"
+COM_TESTQUESTIONS_SET_NO_VARIANTS="Brak wariantów"
+COM_TESTQUESTIONS_SET_MULTI_QUESTIONS_INFO="Pytania są dodawane w poszczególnych wariantach zestawu."
 COM_TESTQUESTIONS_SET_DESCRIPTION="Opis zestawu"
 COM_TESTQUESTIONS_SET_QUESTIONS="Pytania w zestawie"
 COM_TESTQUESTIONS_SET_QUESTION_COUNT="Liczba pytań"
@@ -67,9 +76,21 @@ COM_TESTQUESTIONS_RESULT_PREVIEW="Podgląd zapisanego testu"
 COM_TESTQUESTIONS_RESULT_NOT_FOUND="Nie znaleziono zapisanego testu."
 COM_TESTQUESTIONS_RESULT_PARTICIPANT="Użytkownik"
 COM_TESTQUESTIONS_RESULT_SCORE="Wynik"
+COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER="Punkty przed / po korekcie"
+COM_TESTQUESTIONS_RESULT_GRADE="Ocena"
 COM_TESTQUESTIONS_RESULT_DATE="Data zakończenia"
 COM_TESTQUESTIONS_RESULT_ANSWERS="Odpowiedzi"
+COM_TESTQUESTIONS_RESULT_EXECUTION_TIME="Czas wykonania"
+COM_TESTQUESTIONS_RESULT_AWARDED_POINTS="Uznane punkty (maksymalnie %s)"
+COM_TESTQUESTIONS_RESULT_COMMENT="Komentarz"
+COM_TESTQUESTIONS_RESULT_SAVED="Dane wyniku zostały zapisane."
+COM_TESTQUESTIONS_RESULT_SAVE="Zapisz"
+COM_TESTQUESTIONS_RESULT_SAVE_AND_CLOSE="Zapisz i zamknij"
 COM_TESTQUESTIONS_RESULTS_SEARCH="Szukaj po użytkowniku lub zestawie..."
+COM_TESTQUESTIONS_RESULTS_TEST_NAME="Nazwa testu"
+COM_TESTQUESTIONS_RESULTS_ALL_TESTS="Wszystkie zestawy"
+COM_TESTQUESTIONS_RESULTS_DATE_FROM="Data od"
+COM_TESTQUESTIONS_RESULTS_DATE_TO="Data do"
 COM_TESTQUESTIONS_YOUR_ANSWER="Twoja odpowiedź"
 COM_TESTQUESTIONS_SELECTED_ANSWER="Zaznaczona odpowiedź"
 COM_TESTQUESTIONS_ANSWER_CORRECT="Poprawna odpowiedź"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -11,6 +11,12 @@ class SetController extends FormController
     protected $view_item = 'set';
     protected $view_list = 'sets';
 
+    public function addvariant(): void
+    {
+        $parentId = $this->input->getInt('parent_id');
+        $this->setRedirect('index.php?option=com_testquestions&view=set&layout=edit&parent_id=' . $parentId);
+    }
+
     public function cancel($key = null)
     {
         $this->setRedirect('index.php?option=com_testquestions&view=sets');

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

@@ -33,7 +33,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'])
+                    ->select(['id', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'points'])
                     ->from($db->quoteName('#__testquestions_questions'))
                     ->where('id IN (' . implode(',', $ids) . ')')
             )->loadObjectList('id');
@@ -41,4 +41,35 @@ class ResultModel extends BaseDatabaseModel
 
         return $item;
     }
+
+    public function saveAssessment(int $id, array $awardedPoints, array $comments): bool
+    {
+        $item = $this->getItem($id);
+
+        if (!$item) {
+            return false;
+        }
+
+        foreach ($item->answers as $questionId => &$answer) {
+            $key = (string) $questionId;
+            $maxPoints = (int) ($item->questions[(int) $questionId]->points ?? 0);
+            $answer['awarded_points'] = min($maxPoints, max(0, (int) ($awardedPoints[$key] ?? 0)));
+            $answer['comment'] = trim((string) ($comments[$key] ?? ''));
+        }
+        unset($answer);
+
+        $correctionPoints = 0;
+        foreach ($item->answers as $answer) {
+            $correctionPoints += (int) ($answer['awarded_points'] ?? 0);
+        }
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $row = (object) [
+            'id' => $id,
+            'answers' => json_encode($item->answers, JSON_UNESCAPED_UNICODE),
+            'points_after' => (int) $item->points_before + $correctionPoints,
+        ];
+
+        return (bool) $db->updateObject('#__testquestions_results', $row, 'id');
+    }
 }

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

@@ -13,6 +13,9 @@ class ResultsModel extends ListModel
     {
         parent::populateState($ordering, $direction);
         $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+        $this->setState('filter.set_id', $this->getUserStateFromRequest($this->context . '.filter.set_id', 'filter_set_id', 0, 'int'));
+        $this->setState('filter.date_from', $this->getUserStateFromRequest($this->context . '.filter.date_from', 'filter_date_from', '', 'string'));
+        $this->setState('filter.date_to', $this->getUserStateFromRequest($this->context . '.filter.date_to', 'filter_date_to', '', 'string'));
     }
 
     protected function getListQuery()
@@ -30,6 +33,34 @@ class ResultsModel extends ListModel
             $query->where('(r.participant_name LIKE ' . $needle . ' OR s.title LIKE ' . $needle . ')');
         }
 
+        $setId = (int) $this->getState('filter.set_id');
+        if ($setId > 0) {
+            $query->where('r.set_id = ' . $setId);
+        }
+
+        $dateFrom = (string) $this->getState('filter.date_from');
+        if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $dateFrom)) {
+            $query->where('r.created >= ' . $db->quote($dateFrom . ' 00:00:00'));
+        }
+
+        $dateTo = (string) $this->getState('filter.date_to');
+        if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $dateTo)) {
+            $query->where('r.created <= ' . $db->quote($dateTo . ' 23:59:59'));
+        }
+
         return $query->order('r.created DESC, r.id DESC');
     }
+
+    public function getSets(): array
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['s.id', 's.title', 's.published', 'sub.title AS subject_title'])
+                ->from($db->quoteName('#__testquestions_sets', 's'))
+                ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
+                ->order('sub.title ASC, s.title ASC, s.id ASC')
+        )->loadObjectList();
+    }
 }

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

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

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

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

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

@@ -21,6 +21,8 @@ class HtmlView extends BaseHtmlView
         }
 
         ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULT_PREVIEW'));
+        ToolbarHelper::save('result.save', 'COM_TESTQUESTIONS_RESULT_SAVE');
+        ToolbarHelper::custom('result.save2close', 'save', 'save', 'COM_TESTQUESTIONS_RESULT_SAVE_AND_CLOSE', false);
         ToolbarHelper::link('index.php?option=com_testquestions&view=results', 'COM_TESTQUESTIONS_RESULTS', 'back');
 
         return parent::display($tpl);

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

@@ -14,12 +14,14 @@ class HtmlView extends BaseHtmlView
     protected $items;
     protected $pagination;
     protected $state;
+    protected $sets;
 
     public function display($tpl = null)
     {
         $this->items = $this->get('Items');
         $this->pagination = $this->get('Pagination');
         $this->state = $this->get('State');
+        $this->sets = $this->get('Sets');
         ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULTS'));
         ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
 

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

@@ -14,6 +14,7 @@ class HtmlView extends BaseHtmlView
     protected $item;
     protected $questions;
     protected $categories;
+    protected $variants;
 
     public function display($tpl = null)
     {
@@ -21,6 +22,7 @@ class HtmlView extends BaseHtmlView
         $this->item = $this->get('Item');
         $this->questions = $this->get('Questions');
         $this->categories = $this->get('Categories');
+        $this->variants = $this->item && (int) $this->item->id > 0 ? $this->get('Variants') : [];
 
         if (count($errors = $this->get('Errors'))) {
             throw new \RuntimeException(implode("\n", $errors));

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

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

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

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

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

@@ -9,6 +9,13 @@ HTMLHelper::_('behavior.formvalidator');
 ?>
 <form action="<?php echo Route::_('index.php?option=com_testquestions&view=set&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate">
     <fieldset class="adminform">
+        <?php echo $this->form->renderField('parent_id'); ?>
+        <?php if ((int) $this->item->parent_id > 0) : ?>
+            <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_PARENT'); ?>: <?php echo $this->escape($this->item->parent_title ?? ''); ?></div>
+            <input type="hidden" name="jform[set_type]" value="variant">
+        <?php else : ?>
+            <?php echo $this->form->renderField('set_type'); ?>
+        <?php endif; ?>
         <?php echo $this->form->renderField('title'); ?>
         <?php echo $this->form->renderField('subject_id'); ?>
         <?php echo $this->form->renderField('duration'); ?>
@@ -17,6 +24,27 @@ HTMLHelper::_('behavior.formvalidator');
         <?php echo $this->form->renderField('image'); ?>
         <?php echo $this->form->renderField('description'); ?>
         <?php echo $this->form->renderField('published'); ?>
+        <?php if ((int) $this->item->id > 0 && (string) $this->item->set_type === 'multi') : ?>
+            <fieldset class="mb-3">
+                <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANTS'); ?></legend>
+                <?php if ($this->variants) : ?>
+                    <ul class="list-group mb-3">
+                        <?php foreach ($this->variants as $variant) : ?>
+                            <li class="list-group-item d-flex justify-content-between align-items-center">
+                                <a href="<?php echo Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $variant->id); ?>"><?php echo $this->escape($variant->title); ?></a>
+                                <span class="badge <?php echo (int) $variant->published ? 'bg-success' : 'bg-secondary'; ?>"><?php echo (int) $variant->published ? \Joomla\CMS\Language\Text::_('JPUBLISHED') : \Joomla\CMS\Language\Text::_('JUNPUBLISHED'); ?></span>
+                            </li>
+                        <?php endforeach; ?>
+                    </ul>
+                <?php else : ?>
+                    <p><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_NO_VARIANTS'); ?></p>
+                <?php endif; ?>
+                <a class="btn btn-secondary" href="<?php echo Route::_('index.php?option=com_testquestions&task=set.addvariant&parent_id=' . (int) $this->item->id); ?>">
+                    <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_ADD_VARIANT'); ?>
+                </a>
+            </fieldset>
+        <?php endif; ?>
+        <?php if (!((string) $this->item->set_type === 'multi' && (int) $this->item->parent_id === 0)) : ?>
         <fieldset class="mb-3">
             <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SELECTED_QUESTIONS'); ?></legend>
             <div id="set-selected-question-list" class="border rounded p-3">
@@ -82,6 +110,11 @@ HTMLHelper::_('behavior.formvalidator');
                 <?php endforeach; ?>
             </div>
         </fieldset>
+        <?php else : ?>
+            <div class="alert alert-info">
+                <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_MULTI_QUESTIONS_INFO'); ?>
+            </div>
+        <?php endif; ?>
     </fieldset>
     <input type="hidden" name="task" value="">
     <?php echo HTMLHelper::_('form.token'); ?>

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

@@ -38,6 +38,7 @@ HTMLHelper::_('behavior.multiselect');
             <tr>
                 <th scope="col" class="w-1"><?php echo HTMLHelper::_('grid.checkall'); ?></th>
                 <th scope="col"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></th>
+                <th scope="col"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TYPE'); ?></th>
                 <th scope="col"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SUBJECT'); ?></th>
                 <th scope="col" class="w-15"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_QUESTION_COUNT'); ?></th>
                 <th scope="col" class="w-15"><?php echo \Joomla\CMS\Language\Text::_('JSTATUS'); ?></th>
@@ -48,7 +49,8 @@ HTMLHelper::_('behavior.multiselect');
         <?php foreach ($this->items as $i => $item) : ?>
             <tr>
                 <td><?php echo HTMLHelper::_('grid.id', $i, $item->id); ?></td>
-                <th scope="row"><a href="<?php echo Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $item->id); ?>"><?php echo $this->escape($item->title); ?></a></th>
+                <th scope="row"><a href="<?php echo Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $item->id); ?>"><?php echo (int) $item->parent_id > 0 ? '↳ ' : ''; ?><?php echo $this->escape($item->title); ?></a><?php if ((int) $item->parent_id > 0 && $item->parent_title) : ?> <small class="text-muted">(<?php echo $this->escape($item->parent_title); ?>)</small><?php endif; ?></th>
+                <td><?php echo $this->escape($item->set_type === 'multi' ? \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TYPE_MULTI') : ($item->set_type === 'variant' ? \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TYPE_VARIANT') : \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TYPE_ORDINARY'))); ?></td>
                 <td><?php echo $this->escape($item->subject_title ?: '—'); ?></td>
                 <td><?php echo (int) $item->question_count; ?></td>
                 <td><?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'sets.', true, 'cb'); ?></td>

com_testquestions.xml

@@ -4,7 +4,7 @@
     <creationDate>2026-10-14</creationDate>
     <author>Komponent</author>
     <license>GNU General Public License version 2 or later</license>
-    <version>1.18.0</version>
+    <version>1.36.0</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>

components/com_testquestions/src/Model/SetModel.php

@@ -9,6 +9,8 @@ use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 
 class SetModel extends BaseDatabaseModel
 {
+    protected $resolvedSetId;
+
     protected function getSetId(): int
     {
         $application = Factory::getApplication();
@@ -27,20 +29,46 @@ class SetModel extends BaseDatabaseModel
             return null;
         }
 
-        return $db->setQuery(
+        $set = $db->setQuery(
             $db->getQuery(true)
                 ->select(['s.*', 'sub.title AS subject_title'])
                 ->from($db->quoteName('#__testquestions_sets', 's'))
                 ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
                 ->where('s.id = ' . $setId)
+                ->where('s.parent_id = 0')
                 ->where('s.published = 1')
         )->loadObject();
+
+        if (!$set) {
+            return null;
+        }
+
+        $this->resolvedSetId = $setId;
+
+        if ($set->set_type === 'multi') {
+            $variantId = (int) $db->setQuery(
+                $db->getQuery(true)
+                    ->select('id')
+                    ->from($db->quoteName('#__testquestions_sets'))
+                    ->where('parent_id = ' . $setId)
+                    ->where('published = 1')
+                    ->order('RAND()')
+                    ->setLimit(1)
+            )->loadResult();
+
+            $this->resolvedSetId = $variantId;
+        }
+
+        return $set;
     }
 
     public function getItems()
     {
         $db = Factory::getContainer()->get('DatabaseDriver');
-        $setId = $this->getSetId();
+        if ($this->resolvedSetId === null) {
+            $this->getSet();
+        }
+        $setId = (int) $this->resolvedSetId;
 
         if ($setId < 1) {
             return [];
@@ -48,7 +76,7 @@ class SetModel extends BaseDatabaseModel
 
         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'])
+                ->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)
@@ -67,11 +95,12 @@ class SetModel extends BaseDatabaseModel
                 ->from($db->quoteName('#__testquestions_sets', 's'))
                 ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
                 ->where('s.published = 1')
+                ->where('s.parent_id = 0')
                 ->order('sub.title ASC, s.title ASC')
         )->loadObjectList();
     }
 
-    public function saveResult(string $participantName, int $extraTime, array $result): bool
+    public function saveResult(string $participantName, int $extraTime, int $startedAt, array $result): bool
     {
         $db = Factory::getContainer()->get('DatabaseDriver');
         $setId = $this->getSetId();
@@ -81,13 +110,27 @@ class SetModel extends BaseDatabaseModel
             return false;
         }
 
+        $pointsBefore = 0;
+        $pointsTotal = 0;
+        foreach (($result['items'] ?? []) as $item) {
+            $pointsTotal += (int) ($item['points'] ?? 0);
+            if (!empty($item['correct'])) {
+                $pointsBefore += (int) ($item['points'] ?? 0);
+            }
+        }
+
         $row = (object) [
             'set_id' => $setId,
             'participant_name' => trim($participantName),
+            'started' => $startedAt > 0 ? gmdate('Y-m-d H:i:s', $startedAt) : null,
+            'execution_time' => $startedAt > 0 ? max(0, time() - $startedAt) : 0,
             'extra_time' => max(0, $extraTime),
             'correct_count' => (int) ($result['correct'] ?? 0),
             'total_count' => (int) ($result['total'] ?? 0),
             'percentage' => (float) ($result['percentage'] ?? 0),
+            'points_total' => $pointsTotal,
+            'points_before' => $pointsBefore,
+            'points_after' => $pointsBefore,
             'answers' => json_encode($result['items'] ?? [], JSON_UNESCAPED_UNICODE),
             'created' => Factory::getDate()->toSql(),
             'created_by' => $user ? (int) $user->id : 0,

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

@@ -34,6 +34,7 @@ class HtmlView extends BaseHtmlView
             $this->getModel()->saveResult(
                 $input->post->getString('participant_name', ''),
                 $input->post->getInt('extra_time', 0),
+                $input->post->getInt('test_started_at', 0),
                 $this->results
             );
         }
@@ -73,13 +74,20 @@ class HtmlView extends BaseHtmlView
                 $correct++;
             }
 
-            $results[$item->id] = ['selected' => $selected, 'correct' => $isCorrect];
+            $results[$item->id] = [
+                'selected' => $selected,
+                'correct' => $isCorrect,
+                'points' => (int) ($item->points ?? 0),
+            ];
         }
 
         return [
             'items' => $results,
             'correct' => $correct,
             'total' => count($items),
+            'points_total' => array_sum(array_map(static function ($item) {
+                return (int) ($item->points ?? 0);
+            }, $items)),
             'percentage' => count($items) ? round(($correct / count($items)) * 100, 2) : 0,
         ];
     }

components/com_testquestions/tmpl/set/default.php

@@ -31,6 +31,7 @@ use Joomla\CMS\Factory;
             </select>
         </div>
         <input type="submit" class="egzamin" value="<?php echo htmlspecialchars(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_START_TEST'), ENT_QUOTES, 'UTF-8'); ?>">
+        <input type="hidden" name="test_started_at" value="<?php echo time(); ?>">
     </form>
     <?php endif; ?>
     <?php if (!$this->started) : ?>
@@ -96,6 +97,7 @@ use Joomla\CMS\Factory;
                 <input type="hidden" name="set_id" value="<?php echo (int) $this->set->id; ?>">
                 <input type="hidden" name="participant_name" value="<?php echo htmlspecialchars(Factory::getApplication()->getInput()->post->getString('participant_name', ''), ENT_QUOTES, 'UTF-8'); ?>">
                 <input type="hidden" name="extra_time" value="<?php echo (int) $extraTime; ?>">
+                <input type="hidden" name="test_started_at" value="<?php echo (int) Factory::getApplication()->getInput()->post->getInt('test_started_at', time()); ?>">
                 <input type="hidden" name="task" value="check">
                 <?php echo \Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
                 <?php if (!$this->results) : ?>