Add frontend test view for question sets

README.md

@@ -11,6 +11,7 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - filtrowanie listy pytań po kategorii,
 - przełącznik widoku listy: same pytania albo pytania z odpowiedziami,
 - frontendowy widok pytań filtrowany po symbolu arkusza egzaminacyjnego,
+- frontendowy widok testu na podstawie wybranego zestawu pytań,
 - pozycję menu „Arkusz egzaminacyjny” z opcjonalnym symbolem arkusza,
 - listę wyboru dostępnych symboli arkuszy na stronie klienckiej,
 - możliwość rozwiązania arkusza i wyświetlenia wyniku oraz odpowiedzi poprawnych i zaznaczonych,
@@ -19,10 +20,11 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - opcjonalne zdjęcie wybierane z Media Managera,
 - publikowanie, filtrowanie i usuwanie pytań w panelu administratora,
 - tworzenie zestawów pytań w panelu administratora i przypisywanie do nich pytań,
+- czas trwania w minutach (suwak), treść i obraz zestawu testowego,
 - tabela `#__testquestions_questions` tworzona podczas instalacji.
 
 ## Instalacja
 
-W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.10.0).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.14.0).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/forms/set.xml

@@ -6,6 +6,9 @@
         <field name="subject_id" type="sql" label="COM_TESTQUESTIONS_SUBJECT" required="true" query="SELECT id, title FROM #__testquestions_subjects WHERE published = 1 ORDER BY title ASC" key_field="id" value_field="title" translate_query="false">
             <option value="0">COM_TESTQUESTIONS_SELECT_SUBJECT</option>
         </field>
+        <field name="duration" type="range" label="COM_TESTQUESTIONS_SET_DURATION" description="COM_TESTQUESTIONS_SET_DURATION_DESC" min="0" max="120" step="1" default="0" filter="integer" />
+        <field name="test_content" type="editor" label="COM_TESTQUESTIONS_SET_TEST_CONTENT" buttons="true" filter="safehtml" height="150" />
+        <field name="image" type="media" label="COM_TESTQUESTIONS_SET_IMAGE" directory="images/testquestions" preview="tooltip" />
         <field name="description" type="textarea" label="COM_TESTQUESTIONS_SET_DESCRIPTION" rows="4" filter="raw" />
         <field name="published" type="list" label="JSTATUS" default="1">
             <option value="1">JPUBLISHED</option>

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

@@ -58,8 +58,15 @@ COM_TESTQUESTIONS_SET_ALL_CATEGORIES="Wszystkie kategorie"
 COM_TESTQUESTIONS_UNCATEGORIZED="Bez kategorii"
 COM_TESTQUESTIONS_SET_SHOW_DETAILS="Pokaż odpowiedzi"
 COM_TESTQUESTIONS_SUBJECTS="Przedmioty"
+COM_TESTQUESTIONS_SET_DURATION="Czas trwania testu (minuty)"
+COM_TESTQUESTIONS_SET_DURATION_DESC="Ustaw czas trwania testu w minutach za pomocą suwaka."
+COM_TESTQUESTIONS_SET_TEST_CONTENT="Treść testu"
+COM_TESTQUESTIONS_SET_IMAGE="Obraz testu"
 COM_TESTQUESTIONS_SUBJECT="Przedmiot"
 COM_TESTQUESTIONS_SUBJECT_TITLE="Nazwa przedmiotu"
 COM_TESTQUESTIONS_NEW_SUBJECT="Nowy przedmiot"
 COM_TESTQUESTIONS_EDIT_SUBJECT="Edytuj przedmiot"
 COM_TESTQUESTIONS_SELECT_SUBJECT="-- wybierz przedmiot --"
+COM_TESTQUESTIONS_FILTER_SUBJECT="Wszystkie przedmioty"
+COM_TESTQUESTIONS_SET_SELECTED_QUESTIONS="Wybrane pytania"
+COM_TESTQUESTIONS_SET_AVAILABLE_QUESTIONS="Pytania do wyboru"

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

@@ -42,6 +42,9 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `subject_id` int unsigned NOT NULL DEFAULT 0,
   `title` varchar(255) NOT NULL,
+  `duration` smallint unsigned NOT NULL DEFAULT 0,
+  `test_content` text NULL,
+  `image` varchar(1024) NOT NULL DEFAULT '',
   `description` text NULL,
   `published` tinyint NOT NULL DEFAULT 1,
   `ordering` int NOT NULL DEFAULT 0,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,4 @@
+ALTER TABLE `#__testquestions_sets`
+  ADD COLUMN `duration` smallint unsigned NOT NULL DEFAULT 0 AFTER `title`,
+  ADD COLUMN `test_content` text NULL AFTER `duration`,
+  ADD COLUMN `image` varchar(1024) NOT NULL DEFAULT '' AFTER `test_content`;

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,3 @@
+UPDATE `#__testquestions_sets`
+SET `duration` = `duration` * 60
+WHERE `duration` > 0;

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

@@ -0,0 +1,3 @@
+UPDATE `#__testquestions_sets`
+SET `duration` = ROUND(`duration` / 60)
+WHERE `duration` > 0;

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

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

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

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

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

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

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

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

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

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

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

@@ -2,6 +2,9 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `subject_id` int unsigned NOT NULL DEFAULT 0,
   `title` varchar(255) NOT NULL,
+  `duration` smallint unsigned NOT NULL DEFAULT 0,
+  `test_content` text NULL,
+  `image` varchar(1024) NOT NULL DEFAULT '',
   `description` text NULL,
   `published` tinyint NOT NULL DEFAULT 1,
   `ordering` int NOT NULL DEFAULT 0,

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

@@ -14,6 +14,7 @@ class SetsModel extends ListModel
         parent::populateState($ordering, $direction);
         $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
         $this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
+        $this->setState('filter.subject_id', $this->getUserStateFromRequest($this->context . '.filter.subject_id', 'filter_subject_id', '', 'int'));
     }
 
     protected function getListQuery()
@@ -36,6 +37,23 @@ class SetsModel extends ListModel
             $query->where('s.published = ' . (int) $published);
         }
 
+        if ((int) $this->getState('filter.subject_id') > 0) {
+            $query->where('s.subject_id = ' . (int) $this->getState('filter.subject_id'));
+        }
+
         return $query->order('s.ordering ASC, s.title ASC');
     }
+
+    public function getSubjects()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['id', 'title'])
+                ->from($db->quoteName('#__testquestions_subjects'))
+                ->where($db->quoteName('published') . ' = 1')
+                ->order($db->quoteName('title') . ' ASC')
+        )->loadObjectList();
+    }
 }

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

@@ -14,12 +14,14 @@ class HtmlView extends BaseHtmlView
     protected $items;
     protected $pagination;
     protected $state;
+    protected $subjects;
 
     public function display($tpl = null)
     {
         $this->items = $this->get('Items');
         $this->pagination = $this->get('Pagination');
         $this->state = $this->get('State');
+        $this->subjects = $this->get('Subjects');
 
         if (count($errors = $this->get('Errors'))) {
             throw new \RuntimeException(implode("\n", $errors));

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

@@ -18,7 +18,9 @@ class HtmlView extends BaseHtmlView
         $this->form = $this->get('Form');
         $this->item = $this->get('Item');
         ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SUBJECT') : Text::_('COM_TESTQUESTIONS_NEW_SUBJECT'));
+        ToolbarHelper::apply('subject.apply', 'JTOOLBAR_APPLY');
         ToolbarHelper::save('subject.save', 'JTOOLBAR_SAVE');
+        ToolbarHelper::save2new('subject.save2new', 'JTOOLBAR_SAVE_AND_NEW');
         ToolbarHelper::cancel('subject.cancel', 'JTOOLBAR_CANCEL');
 
         return parent::display($tpl);

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

@@ -47,8 +47,6 @@ HTMLHelper::_('behavior.multiselect');
             <tr>
                 <th scope="col" class="w-1"><?php echo HTMLHelper::_('grid.checkall'); ?></th>
                 <th scope="col"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_QUESTION'); ?></th>
-                <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_TYPE'); ?></th>
-                <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_CORRECT'); ?></th>
                 <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('JSTATUS'); ?></th>
                 <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_ID'); ?></th>
             </tr>
@@ -67,16 +65,14 @@ HTMLHelper::_('behavior.multiselect');
                             <?php if ($item->question_type === 'open') : ?>
                                 <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FIELD_OPEN_PATTERN'); ?>:</strong> <?php echo $item->answer_open; ?></div>
                             <?php else : ?>
-                                <div><strong>A:</strong> <?php echo $item->answer_a; ?></div>
-                                <div><strong>B:</strong> <?php echo $item->answer_b; ?></div>
-                                <div><strong>C:</strong> <?php echo $item->answer_c; ?></div>
-                                <div><strong>D:</strong> <?php echo $item->answer_d; ?></div>
+                                <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">A:</strong><span><?php echo $item->answer_a; ?></span><?php if ((int) $item->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><span><?php echo $item->answer_b; ?></span><?php if ((int) $item->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><span><?php echo $item->answer_c; ?></span><?php if ((int) $item->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><span><?php echo $item->answer_d; ?></span><?php if ((int) $item->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
                             <?php endif; ?>
                         </div>
                     <?php endif; ?>
                 </th>
-                <td><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_TYPE_' . strtoupper($item->question_type)); ?></td>
-                <td><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_' . chr(64 + (int) $item->correct_answer)); ?></td>
                 <td><?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'questions.', true, 'cb'); ?></td>
                 <td><?php echo (int) $item->id; ?></td>
             </tr>

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

@@ -10,23 +10,20 @@ 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('title'); ?>
+        <?php echo $this->form->renderField('subject_id'); ?>
+        <?php echo $this->form->renderField('duration'); ?>
+        <output id="set-duration-value" class="form-text mb-3"></output>
+        <?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'); ?>
-        <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=""><?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>
         <fieldset class="mb-3">
-            <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_QUESTIONS'); ?></legend>
-            <div id="set-question-list" class="border rounded p-3">
+            <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SELECTED_QUESTIONS'); ?></legend>
+            <div id="set-selected-question-list" class="border rounded p-3">
                 <?php foreach ($this->questions as $question) : ?>
-                    <div class="form-check set-question-row" data-category="<?php echo (int) $question->category_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; ?>" <?php echo in_array((int) $question->id, (array) $this->item->question_ids, true) ? 'checked' : ''; ?>>
+                    <?php if (!in_array((int) $question->id, array_map('intval', (array) $this->item->question_ids), true)) continue; ?>
+                    <div class="form-check set-question-row">
+                        <input class="form-check-input" type="checkbox" name="jform[question_ids][]" value="<?php echo (int) $question->id; ?>" id="set-question-<?php echo (int) $question->id; ?>" checked>
                         <label class="form-check-label" for="set-question-<?php echo (int) $question->id; ?>">
                             <span class="badge bg-secondary"><?php echo $this->escape($question->category_title ?: \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_UNCATEGORIZED')); ?></span>
                             <?php echo $this->escape(trim(strip_tags($question->question))); ?>
@@ -37,10 +34,47 @@ HTMLHelper::_('behavior.formvalidator');
                                 <?php if ($question->question_type === 'open') : ?>
                                     <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FIELD_OPEN_PATTERN'); ?>:</strong> <?php echo $this->escape($question->answer_open); ?></div>
                                 <?php else : ?>
-                                    <div><strong>A:</strong> <?php echo $question->answer_a; ?><?php echo (int) $question->correct_answer === 1 ? ' ✓' : ''; ?></div>
-                                    <div><strong>B:</strong> <?php echo $question->answer_b; ?><?php echo (int) $question->correct_answer === 2 ? ' ✓' : ''; ?></div>
-                                    <div><strong>C:</strong> <?php echo $question->answer_c; ?><?php echo (int) $question->correct_answer === 3 ? ' ✓' : ''; ?></div>
-                                    <div><strong>D:</strong> <?php echo $question->answer_d; ?><?php echo (int) $question->correct_answer === 4 ? ' ✓' : ''; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">A:</strong><span><?php echo $question->answer_a; ?></span><?php if ((int) $question->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><span><?php echo $question->answer_b; ?></span><?php if ((int) $question->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><span><?php echo $question->answer_c; ?></span><?php if ((int) $question->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><span><?php echo $question->answer_d; ?></span><?php if ((int) $question->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                <?php endif; ?>
+                            </div>
+                        </details>
+                    </div>
+                <?php endforeach; ?>
+            </div>
+        </fieldset>
+        <fieldset class="mb-3">
+            <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_AVAILABLE_QUESTIONS'); ?></legend>
+            <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=""><?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 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; ?>">
+                        <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>
+                            <?php echo $this->escape(trim(strip_tags($question->question))); ?>
+                        </label>
+                        <details class="ms-4 mt-1 mb-2">
+                            <summary><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SHOW_DETAILS'); ?></summary>
+                            <div class="mt-2 p-2 bg-light border rounded">
+                                <?php if ($question->question_type === 'open') : ?>
+                                    <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FIELD_OPEN_PATTERN'); ?>:</strong> <?php echo $this->escape($question->answer_open); ?></div>
+                                <?php else : ?>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">A:</strong><span><?php echo $question->answer_a; ?></span><?php if ((int) $question->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><span><?php echo $question->answer_b; ?></span><?php if ((int) $question->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><span><?php echo $question->answer_c; ?></span><?php if ((int) $question->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><span><?php echo $question->answer_d; ?></span><?php if ((int) $question->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
                                 <?php endif; ?>
                             </div>
                         </details>
@@ -55,7 +89,7 @@ HTMLHelper::_('behavior.formvalidator');
 <script>
 document.addEventListener('DOMContentLoaded', function () {
     const filter = document.getElementById('set-question-category');
-    const rows = document.querySelectorAll('.set-question-row');
+    const rows = document.querySelectorAll('.set-available-question-row');
 
     if (!filter) {
         return;
@@ -68,3 +102,20 @@ document.addEventListener('DOMContentLoaded', function () {
     });
 });
 </script>
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    const duration = document.getElementById('jform_duration');
+    const output = document.getElementById('set-duration-value');
+
+    if (!duration || !output) {
+        return;
+    }
+
+    const updateDuration = function () {
+        output.textContent = duration.value + ' min';
+    };
+
+    duration.addEventListener('input', updateDuration);
+    updateDuration();
+});
+</script>

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

@@ -9,16 +9,24 @@ HTMLHelper::_('behavior.multiselect');
 ?>
 <form action="<?php echo Route::_('index.php?option=com_testquestions&view=sets'); ?>" method="post" name="adminForm" id="adminForm">
     <div class="row mb-3">
-        <div class="col-md-6">
+        <div class="col-md-4">
             <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_SET_SEARCH')); ?>">
         </div>
-        <div class="col-md-3">
+        <div class="col-md-2">
             <select name="filter_published" class="form-select" onchange="this.form.submit();">
                 <option value=""><?php echo \Joomla\CMS\Language\Text::_('JOPTION_SELECT_PUBLISHED'); ?></option>
                 <option value="1" <?php echo $this->state->get('filter.published') === '1' ? 'selected' : ''; ?>><?php echo \Joomla\CMS\Language\Text::_('JPUBLISHED'); ?></option>
                 <option value="0" <?php echo $this->state->get('filter.published') === '0' ? 'selected' : ''; ?>><?php echo \Joomla\CMS\Language\Text::_('JUNPUBLISHED'); ?></option>
             </select>
         </div>
+        <div class="col-md-3">
+            <select name="filter_subject_id" class="form-select" onchange="this.form.submit();">
+                <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FILTER_SUBJECT'); ?></option>
+                <?php foreach ($this->subjects as $subject) : ?>
+                    <option value="<?php echo (int) $subject->id; ?>" <?php echo (int) $this->state->get('filter.subject_id') === (int) $subject->id ? 'selected' : ''; ?>><?php echo $this->escape($subject->title); ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
         <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>

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

@@ -1,8 +1,13 @@
-<?php defined('_JEXEC') or die; ?>
-<form action="index.php?option=com_testquestions&layout=edit&id=<?php echo (int) $this->item->id; ?>" method="post" name="adminForm" id="subject-form">
+<?php
+
+defined('_JEXEC') or die;
+
+Joomla\CMS\HTML\HTMLHelper::_('behavior.formvalidator');
+?>
+<form action="index.php?option=com_testquestions&view=subject&layout=edit&id=<?php echo (int) $this->item->id; ?>" method="post" name="adminForm" id="subject-form" class="form-validate">
     <?php echo $this->form->renderField('title'); ?>
     <?php echo $this->form->renderField('published'); ?>
     <?php echo $this->form->renderField('id'); ?>
-    <input type="hidden" name="task" value="subject.save">
+    <input type="hidden" name="task" value="">
     <?php echo Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
 </form>

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

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

@@ -17,3 +17,5 @@ COM_TESTQUESTIONS_MENU_ITEM_TITLE="Arkusz egzaminacyjny"
 COM_TESTQUESTIONS_MENU_ITEM_DESCRIPTION="Wyświetla pytania z wybranego arkusza egzaminacyjnego."
 COM_TESTQUESTIONS_MENU_TEST_SYMBOL_DESC="Opcjonalnie wybierz symbol arkusza, który ma być wyświetlany po wejściu z menu."
 COM_TESTQUESTIONS_ENTER_ANSWER="Wpisz odpowiedź"
+COM_TESTQUESTIONS_SET_DURATION="Czas trwania testu"
+COM_TESTQUESTIONS_SET_NOT_FOUND="Nie znaleziono wybranego zestawu testowego."

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

@@ -1,3 +1,6 @@
 COM_TESTQUESTIONS="Pytania testowe"
 COM_TESTQUESTIONS_MENU_ITEM_TITLE="Arkusz egzaminacyjny"
 COM_TESTQUESTIONS_MENU_ITEM_DESCRIPTION="Wyświetla pytania z wybranego arkusza egzaminacyjnego."
+COM_TESTQUESTIONS_SET_MENU_ITEM_TITLE="Zestaw testowy"
+COM_TESTQUESTIONS_SET_MENU_ITEM_DESCRIPTION="Wyświetla test na podstawie wybranego zestawu pytań."
+COM_TESTQUESTIONS_SET_SELECT="Zestaw pytań"

components/com_testquestions/src/Model/SetModel.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Site\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+
+class SetModel extends BaseDatabaseModel
+{
+    protected function getSetId(): int
+    {
+        $application = Factory::getApplication();
+        $menu = $application->getMenu()->getActive();
+        $menuSetId = $menu ? (int) $menu->getParams()->get('set_id', 0) : 0;
+
+        return $application->getInput()->getInt('set_id', $menuSetId);
+    }
+
+    public function getSet()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $setId = $this->getSetId();
+
+        if ($setId < 1) {
+            return null;
+        }
+
+        return $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.published = 1')
+        )->loadObject();
+    }
+
+    public function getItems()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $setId = $this->getSetId();
+
+        if ($setId < 1) {
+            return [];
+        }
+
+        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();
+    }
+}

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

@@ -0,0 +1,67 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Site\View\Set;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $set;
+    protected $items;
+    protected $results;
+
+    public function display($tpl = null)
+    {
+        $this->set = $this->get('Set');
+        $this->items = $this->get('Items');
+        $this->results = $this->buildResults($this->items);
+
+        return parent::display($tpl);
+    }
+
+    protected function buildResults(array $items)
+    {
+        $input = Factory::getApplication()->getInput();
+
+        if ($input->getCmd('task') !== 'check' || $input->getMethod() !== 'POST') {
+            return null;
+        }
+
+        $answers = (array) $input->post->get('answers', [], 'array');
+        $results = [];
+        $correct = 0;
+
+        foreach ($items as $item) {
+            $selected = isset($answers[$item->id]) ? trim((string) $answers[$item->id]) : '';
+            $isCorrect = false;
+
+            if ($item->question_type === 'open') {
+                $patterns = preg_split('/\s*\|\s*/', (string) $item->answer_open, -1, PREG_SPLIT_NO_EMPTY);
+                foreach ($patterns as $pattern) {
+                    if (mb_strtolower(trim($pattern), 'UTF-8') === mb_strtolower($selected, 'UTF-8')) {
+                        $isCorrect = true;
+                        break;
+                    }
+                }
+            } else {
+                $isCorrect = (string) $item->correct_answer === $selected;
+            }
+
+            if ($isCorrect) {
+                $correct++;
+            }
+
+            $results[$item->id] = ['selected' => $selected, 'correct' => $isCorrect];
+        }
+
+        return [
+            'items' => $results,
+            'correct' => $correct,
+            'total' => count($items),
+            'percentage' => count($items) ? round(($correct / count($items)) * 100, 2) : 0,
+        ];
+    }
+}

components/com_testquestions/tmpl/set/default.php

@@ -0,0 +1,56 @@
+<?php
+
+defined('_JEXEC') or die;
+?>
+<div class="com-testquestions egzamin">
+    <?php if (!$this->set) : ?>
+        <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_NOT_FOUND'); ?></div>
+    <?php else : ?>
+        <header class="test-set-header">
+            <?php if ($this->set->subject_title) : ?><div class="text-muted"><?php echo htmlspecialchars($this->set->subject_title, ENT_QUOTES, 'UTF-8'); ?></div><?php endif; ?>
+            <h1><?php echo htmlspecialchars($this->set->title, ENT_QUOTES, 'UTF-8'); ?></h1>
+            <?php 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; ?> min</div><?php endif; ?>
+            <?php if ($this->set->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($this->set->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
+            <?php if ($this->set->test_content) : ?><div class="test-set-content"><?php echo $this->set->test_content; ?></div><?php endif; ?>
+        </header>
+        <?php if ($this->results) : ?>
+            <div class="alert alert-success test-result"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT'); ?>:</strong> <?php echo (int) $this->results['correct']; ?> / <?php echo (int) $this->results['total']; ?> (<?php echo htmlspecialchars((string) $this->results['percentage'], ENT_QUOTES, 'UTF-8'); ?>%)</div>
+        <?php endif; ?>
+        <?php if ($this->items) : ?>
+            <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="post">
+            <?php foreach ($this->items as $number => $item) : ?>
+                <article class="testquestion mb-4">
+                    <div class="pyt"><div class="question-header"><span class="question-number"><?php echo ($number + 1) . '.'; ?></span><div class="question-text"><?php echo $item->question; ?></div></div></div>
+                    <?php if ($item->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($item->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
+                    <?php if ($item->question_type === 'open') : ?>
+                        <div class="<?php echo $this->results ? ($this->results['items'][$item->id]['correct'] ? 'odpup' : 'odpu') : 'odp'; ?>">
+                            <label for="set-answer-<?php echo (int) $number; ?>"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ENTER_ANSWER'); ?></label>
+                            <input type="text" id="set-answer-<?php echo (int) $number; ?>" name="answers[<?php echo (int) $item->id; ?>]" class="form-control" value="<?php echo $this->results ? htmlspecialchars($this->results['items'][$item->id]['selected'], 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 $isSelected = $this->results && $this->results['items'][$item->id]['selected'] === (string) ($answerIndex + 1); ?>
+                            <?php $isCorrectAnswer = $this->results && (string) $item->correct_answer === (string) ($answerIndex + 1); ?>
+                            <li class="<?php echo $isSelected && $this->results['items'][$item->id]['correct'] ? 'odpup' : ($isSelected ? 'odpu' : ($isCorrectAnswer ? 'odpp' : 'odp')); ?>">
+                                <label><input type="radio" name="answers[<?php echo (int) $item->id; ?>]" value="<?php echo $answerIndex + 1; ?>" <?php echo $isSelected ? 'checked' : ''; ?>><strong><?php echo chr(65 + $answerIndex); ?>.</strong> <span class="answer-text"><?php echo $item->$answerField; ?></span></label>
+                            </li>
+                        <?php endforeach; ?>
+                        </ol>
+                    <?php endif; ?>
+                    <?php if ($this->results) : ?>
+                        <div class="mt-2 <?php echo $this->results['items'][$item->id]['correct'] ? 'text-success' : 'text-danger'; ?>">
+                            <?php echo $this->results['items'][$item->id]['correct'] ? '✓ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_CORRECT') : '✗ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_INCORRECT'); ?>
+                            <?php if ($item->question_type === 'closed') : ?> — <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_ANSWER'); ?>: <?php echo chr(64 + (int) $item->correct_answer); ?><?php else : ?> — <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_PATTERN'); ?>: <?php echo htmlspecialchars($item->answer_open, ENT_QUOTES, 'UTF-8'); ?><?php endif; ?>
+                        </div>
+                    <?php endif; ?>
+                </article>
+            <?php endforeach; ?>
+                <input type="hidden" name="set_id" value="<?php echo (int) $this->set->id; ?>">
+                <input type="hidden" name="task" value="check">
+                <?php echo \Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
+                <input type="submit" class="egzamin" value="<?php echo htmlspecialchars(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FINISH_TEST'), ENT_QUOTES, 'UTF-8'); ?>">
+            </form>
+        <?php endif; ?>
+    <?php endif; ?>
+</div>

components/com_testquestions/tmpl/set/default.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+    <layout title="COM_TESTQUESTIONS_SET_MENU_ITEM_TITLE">
+        <message>COM_TESTQUESTIONS_SET_MENU_ITEM_DESCRIPTION</message>
+    </layout>
+    <fields name="request">
+        <fieldset name="request">
+            <field name="set_id" type="sql" label="COM_TESTQUESTIONS_SET_SELECT" required="true"
+                query="SELECT id AS value, title AS text FROM #__testquestions_sets WHERE published = 1 ORDER BY title"
+                key_field="value" value_field="text" />
+        </fieldset>
+    </fields>
+</metadata>