Show subject field in set form

README.md

@@ -18,10 +18,11 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - wskazanie poprawnej odpowiedzi,
 - 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ń,
 - 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.8.3).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.10.2).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/forms/set.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+    <fieldset name="details">
+        <field name="id" type="hidden" />
+        <field name="title" type="text" label="COM_TESTQUESTIONS_SET_TITLE" required="true" maxlength="255" />
+        <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="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>
+            <option value="0">JUNPUBLISHED</option>
+        </field>
+    </fieldset>
+</form>

administrator/components/com_testquestions/forms/subject.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+    <fieldset name="details">
+        <field name="id" type="hidden" />
+        <field name="title" type="text" label="COM_TESTQUESTIONS_SUBJECT_TITLE" required="true" maxlength="150" />
+        <field name="published" type="list" label="JSTATUS" default="1">
+            <option value="1">JPUBLISHED</option>
+            <option value="0">JUNPUBLISHED</option>
+        </field>
+    </fieldset>
+</form>

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

@@ -45,3 +45,21 @@ COM_TESTQUESTIONS_ERROR_QUESTION_TYPE="Wybierz poprawny typ pytania."
 COM_TESTQUESTIONS_ERROR_OPEN_PATTERN="Dla pytania otwartego wpisz wzorzec poprawnej odpowiedzi."
 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_NEW_SET="Nowy zestaw pytań"
+COM_TESTQUESTIONS_EDIT_SET="Edytuj zestaw pytań"
+COM_TESTQUESTIONS_SET_TITLE="Nazwa zestawu"
+COM_TESTQUESTIONS_SET_DESCRIPTION="Opis zestawu"
+COM_TESTQUESTIONS_SET_QUESTIONS="Pytania w zestawie"
+COM_TESTQUESTIONS_SET_QUESTION_COUNT="Liczba pytań"
+COM_TESTQUESTIONS_SET_SEARCH="Szukaj zestawów..."
+COM_TESTQUESTIONS_SET_CATEGORY_FILTER="Filtruj pytania według kategorii"
+COM_TESTQUESTIONS_SET_ALL_CATEGORIES="Wszystkie kategorie"
+COM_TESTQUESTIONS_UNCATEGORIZED="Bez kategorii"
+COM_TESTQUESTIONS_SET_SHOW_DETAILS="Pokaż odpowiedzi"
+COM_TESTQUESTIONS_SUBJECTS="Przedmioty"
+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 --"

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

@@ -37,3 +37,36 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_categories` (
 
 INSERT IGNORE INTO `#__testquestions_categories` (`id`, `title`, `published`, `ordering`)
 VALUES (1, 'Bez kategorii', 1, 0);
+
+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,
+  `description` text NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  `created` datetime NULL DEFAULT NULL,
+  `created_by` int unsigned NOT NULL DEFAULT 0,
+  `modified` datetime NULL DEFAULT NULL,
+  `modified_by` int unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `idx_published` (`published`),
+  KEY `idx_ordering` (`ordering`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `#__testquestions_subjects` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(150) NOT NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `#__testquestions_set_questions` (
+  `set_id` int unsigned NOT NULL,
+  `question_id` int unsigned NOT NULL,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`set_id`, `question_id`),
+  KEY `idx_question_id` (`question_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

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

@@ -1 +1,4 @@
+DROP TABLE IF EXISTS `#__testquestions_set_questions`;
+DROP TABLE IF EXISTS `#__testquestions_sets`;
+DROP TABLE IF EXISTS `#__testquestions_subjects`;
 DROP TABLE IF EXISTS `#__testquestions_questions`;

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

@@ -0,0 +1,11 @@
+CREATE TABLE IF NOT EXISTS `#__testquestions_subjects` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(150) NOT NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+ALTER TABLE `#__testquestions_sets`
+  ADD COLUMN `subject_id` int unsigned NOT NULL DEFAULT 0 AFTER `id`;

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.9.0.sql

@@ -0,0 +1,32 @@
+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,
+  `description` text NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  `created` datetime NULL DEFAULT NULL,
+  `created_by` int unsigned NOT NULL DEFAULT 0,
+  `modified` datetime NULL DEFAULT NULL,
+  `modified_by` int unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `idx_published` (`published`),
+  KEY `idx_ordering` (`ordering`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `#__testquestions_subjects` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(150) NOT NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `#__testquestions_set_questions` (
+  `set_id` int unsigned NOT NULL,
+  `question_id` int unsigned NOT NULL,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`set_id`, `question_id`),
+  KEY `idx_question_id` (`question_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\FormController;
+
+class SetController extends FormController
+{
+    protected $view_item = 'set';
+    protected $view_list = 'sets';
+
+    public function cancel($key = null)
+    {
+        $this->setRedirect('index.php?option=com_testquestions&view=sets');
+
+        return true;
+    }
+}

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

@@ -0,0 +1,17 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\AdminController;
+
+class SetsController extends AdminController
+{
+    protected $text_prefix = 'COM_TESTQUESTIONS';
+
+    public function getModel($name = 'Set', $prefix = 'Administrator', $config = ['ignore_request' => true])
+    {
+        return parent::getModel($name, $prefix, $config);
+    }
+}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\FormController;
+
+class SubjectController extends FormController
+{
+    protected $view_item = 'subject';
+    protected $view_list = 'subjects';
+
+    public function cancel($key = null)
+    {
+        $this->setRedirect('index.php?option=com_testquestions&view=subjects');
+
+        return true;
+    }
+}

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

@@ -0,0 +1,17 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\AdminController;
+
+class SubjectsController extends AdminController
+{
+    protected $text_prefix = 'COM_TESTQUESTIONS';
+
+    public function getModel($name = 'Subject', $prefix = 'Administrator', $config = ['ignore_request' => true])
+    {
+        return parent::getModel($name, $prefix, $config);
+    }
+}

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

@@ -0,0 +1,124 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\AdminModel;
+
+class SetModel extends AdminModel
+{
+    public function getTable($name = 'Set', $prefix = 'Administrator', $config = [])
+    {
+        return $this->getMVCFactory()->createTable($name, $prefix, $config);
+    }
+
+    public function getForm($data = [], $loadData = true)
+    {
+        return $this->loadForm('com_testquestions.set', 'set', ['control' => 'jform', 'load_data' => $loadData]);
+    }
+
+    public function getItem($pk = null)
+    {
+        $item = parent::getItem($pk);
+
+        if ($item && !empty($item->id)) {
+            $db = Factory::getContainer()->get('DatabaseDriver');
+            $item->question_ids = $db->setQuery(
+                $db->getQuery(true)
+                    ->select($db->quoteName('question_id'))
+                    ->from($db->quoteName('#__testquestions_set_questions'))
+                    ->where($db->quoteName('set_id') . ' = ' . (int) $item->id)
+                    ->order($db->quoteName('ordering') . ' ASC')
+            )->loadColumn();
+        } else {
+            $item->question_ids = [];
+        }
+
+        return $item;
+    }
+
+    protected function loadFormData()
+    {
+        return Factory::getApplication()->getUserState('com_testquestions.edit.set.data', []) ?: $this->getItem();
+    }
+
+    public function getQuestions()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['q.id', 'q.question', 'q.question_type', 'q.answer_a', 'q.answer_b', 'q.answer_c', 'q.answer_d', 'q.answer_open', 'q.correct_answer', 'q.category_id', 'c.title AS category_title'])
+                ->from($db->quoteName('#__testquestions_questions', 'q'))
+                ->leftJoin($db->quoteName('#__testquestions_categories', 'c') . ' ON c.id = q.category_id')
+                ->order('c.title ASC, q.ordering ASC, q.id ASC')
+        )->loadObjectList();
+    }
+
+    public function getCategories()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['id', 'title'])
+                ->from($db->quoteName('#__testquestions_categories'))
+                ->order($db->quoteName('title') . ' 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']);
+
+        if (!parent::save($data)) {
+            return false;
+        }
+
+        $setId = (int) $this->getState($this->getName() . '.id');
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $db->setQuery(
+            $db->getQuery(true)
+                ->delete($db->quoteName('#__testquestions_set_questions'))
+                ->where($db->quoteName('set_id') . ' = ' . $setId)
+        )->execute();
+
+        if ($questionIds) {
+            $query = $db->getQuery(true)
+                ->insert($db->quoteName('#__testquestions_set_questions'))
+                ->columns([$db->quoteName('set_id'), $db->quoteName('question_id'), $db->quoteName('ordering')]);
+
+            foreach ($questionIds as $ordering => $questionId) {
+                $query->values(implode(',', [$setId, $questionId, $ordering]));
+            }
+
+            $db->setQuery($query)->execute();
+        }
+
+        return true;
+    }
+
+    public function delete(&$pks)
+    {
+        if (!parent::delete($pks)) {
+            return false;
+        }
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $ids = array_map('intval', (array) $pks);
+
+        if ($ids) {
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->delete($db->quoteName('#__testquestions_set_questions'))
+                    ->where($db->quoteName('set_id') . ' IN (' . implode(',', $ids) . ')')
+            )->execute();
+        }
+
+        return true;
+    }
+}

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

@@ -0,0 +1,41 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\ListModel;
+
+class SetsModel extends ListModel
+{
+    protected function populateState($ordering = 's.ordering', $direction = 'asc')
+    {
+        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'));
+    }
+
+    protected function getListQuery()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $query = $db->getQuery(true)
+            ->select(['s.*', 'sub.title AS subject_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_set_questions', 'sq') . ' ON sq.set_id = s.id')
+            ->group('s.id');
+
+        $search = trim((string) $this->getState('filter.search'));
+        if ($search !== '') {
+            $query->where('s.title LIKE ' . $db->quote('%' . $db->escape($search, true) . '%', false));
+        }
+
+        $published = $this->getState('filter.published');
+        if ($published !== '' && $published !== null) {
+            $query->where('s.published = ' . (int) $published);
+        }
+
+        return $query->order('s.ordering ASC, s.title ASC');
+    }
+}

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

@@ -0,0 +1,26 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\AdminModel;
+
+class SubjectModel extends AdminModel
+{
+    public function getTable($name = 'Subject', $prefix = 'Administrator', $config = [])
+    {
+        return $this->getMVCFactory()->createTable($name, $prefix, $config);
+    }
+
+    public function getForm($data = [], $loadData = true)
+    {
+        return $this->loadForm('com_testquestions.subject', 'subject', ['control' => 'jform', 'load_data' => $loadData]);
+    }
+
+    protected function loadFormData()
+    {
+        return Factory::getApplication()->getUserState('com_testquestions.edit.subject.data', []) ?: $this->getItem();
+    }
+}

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

@@ -0,0 +1,21 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\ListModel;
+
+class SubjectsModel extends ListModel
+{
+    protected function getListQuery()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->getQuery(true)
+            ->select('*')
+            ->from($db->quoteName('#__testquestions_subjects'))
+            ->order($db->quoteName('ordering') . ' ASC, ' . $db->quoteName('title') . ' ASC');
+    }
+}

administrator/components/com_testquestions/src/Table/SetTable.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Table;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Table\Table;
+use Joomla\Database\DatabaseDriver;
+
+class SetTable extends Table
+{
+    public function __construct(DatabaseDriver $db)
+    {
+        parent::__construct('#__testquestions_sets', 'id', $db);
+    }
+
+    public function check($updateNulls = false): bool
+    {
+        $this->title = trim((string) $this->title);
+
+        return $this->title !== '' && parent::check($updateNulls);
+    }
+}

administrator/components/com_testquestions/src/Table/SubjectTable.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Table;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Table\Table;
+use Joomla\Database\DatabaseDriver;
+
+class SubjectTable extends Table
+{
+    public function __construct(DatabaseDriver $db)
+    {
+        parent::__construct('#__testquestions_subjects', 'id', $db);
+    }
+
+    public function check($updateNulls = false): bool
+    {
+        $this->title = trim((string) $this->title);
+
+        return $this->title !== '' && parent::check($updateNulls);
+    }
+}

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

@@ -51,5 +51,11 @@ class HtmlView extends BaseHtmlView
             'COM_TESTQUESTIONS_MANAGE_CATEGORIES',
             'list'
         );
+
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=sets',
+            'COM_TESTQUESTIONS_SETS',
+            'list'
+        );
     }
 }

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

@@ -0,0 +1,41 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Set;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $form;
+    protected $item;
+    protected $questions;
+    protected $categories;
+
+    public function display($tpl = null)
+    {
+        $this->form = $this->get('Form');
+        $this->item = $this->get('Item');
+        $this->questions = $this->get('Questions');
+        $this->categories = $this->get('Categories');
+
+        if (count($errors = $this->get('Errors'))) {
+            throw new \RuntimeException(implode("\n", $errors));
+        }
+
+        $this->addToolbar();
+
+        return parent::display($tpl);
+    }
+
+    protected function addToolbar()
+    {
+        ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SET') : Text::_('COM_TESTQUESTIONS_NEW_SET'));
+        ToolbarHelper::apply('set.apply', 'JTOOLBAR_APPLY');
+        ToolbarHelper::save('set.save', 'JTOOLBAR_SAVE');
+        ToolbarHelper::cancel('set.cancel', 'JTOOLBAR_CANCEL');
+    }
+}

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

@@ -0,0 +1,59 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Sets;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $items;
+    protected $pagination;
+    protected $state;
+
+    public function display($tpl = null)
+    {
+        $this->items = $this->get('Items');
+        $this->pagination = $this->get('Pagination');
+        $this->state = $this->get('State');
+
+        if (count($errors = $this->get('Errors'))) {
+            throw new \RuntimeException(implode("\n", $errors));
+        }
+
+        $this->addToolbar();
+
+        return parent::display($tpl);
+    }
+
+    protected function addToolbar()
+    {
+        $user = $this->getCurrentUser();
+        $this->getDocument()->setTitle(Text::_('COM_TESTQUESTIONS_SETS'));
+
+        if ($user->authorise('core.create', 'com_testquestions')) {
+            ToolbarHelper::addNew('set.add', 'JTOOLBAR_NEW');
+        }
+        if ($user->authorise('core.edit', 'com_testquestions')) {
+            ToolbarHelper::editList('set.edit', 'JTOOLBAR_EDIT');
+        }
+        if ($user->authorise('core.delete', 'com_testquestions')) {
+            ToolbarHelper::deleteList('', 'sets.delete', 'JTOOLBAR_DELETE');
+        }
+
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=questions',
+            'COM_TESTQUESTIONS_QUESTIONS',
+            'list'
+        );
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=subjects',
+            'COM_TESTQUESTIONS_SUBJECTS',
+            'list'
+        );
+    }
+}

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

@@ -0,0 +1,26 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Subject;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $form;
+    protected $item;
+
+    public function display($tpl = null)
+    {
+        $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::save('subject.save', 'JTOOLBAR_SAVE');
+        ToolbarHelper::cancel('subject.cancel', 'JTOOLBAR_CANCEL');
+
+        return parent::display($tpl);
+    }
+}

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

@@ -0,0 +1,27 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Subjects;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $items;
+
+    public function display($tpl = null)
+    {
+        $this->items = $this->get('Items');
+        ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_SUBJECTS'));
+        ToolbarHelper::addNew('subject.add', 'JTOOLBAR_NEW');
+        ToolbarHelper::editList('subject.edit', 'JTOOLBAR_EDIT');
+        ToolbarHelper::deleteList('', 'subjects.delete', 'JTOOLBAR_DELETE');
+        ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
+
+        return parent::display($tpl);
+    }
+}

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

@@ -0,0 +1,71 @@
+<?php
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Router\Route;
+
+HTMLHelper::_('behavior.formvalidator');
+?>
+<form action="<?php echo Route::_('index.php?option=com_testquestions&view=set&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate">
+    <fieldset class="adminform">
+        <?php echo $this->form->renderField('title'); ?>
+        <?php echo $this->form->renderField('subject_id'); ?>
+        <?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">
+                <?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' : ''; ?>>
+                        <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><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>
+                                <?php endif; ?>
+                            </div>
+                        </details>
+                    </div>
+                <?php endforeach; ?>
+            </div>
+        </fieldset>
+    </fieldset>
+    <input type="hidden" name="task" value="">
+    <?php echo HTMLHelper::_('form.token'); ?>
+</form>
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    const filter = document.getElementById('set-question-category');
+    const rows = document.querySelectorAll('.set-question-row');
+
+    if (!filter) {
+        return;
+    }
+
+    filter.addEventListener('change', function () {
+        rows.forEach(function (row) {
+            row.classList.toggle('d-none', filter.value !== '' && row.dataset.category !== filter.value);
+        });
+    });
+});
+</script>

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

@@ -0,0 +1,57 @@
+<?php
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Router\Route;
+
+HTMLHelper::_('behavior.multiselect');
+?>
+<form action="<?php echo Route::_('index.php?option=com_testquestions&view=sets'); ?>" method="post" name="adminForm" id="adminForm">
+    <div class="row mb-3">
+        <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_SET_SEARCH')); ?>">
+        </div>
+        <div class="col-md-3">
+            <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">
+            <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>
+        </div>
+    </div>
+
+    <table class="table table-striped">
+        <thead>
+            <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_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>
+                <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_ID'); ?></th>
+            </tr>
+        </thead>
+        <tbody>
+        <?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>
+                <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>
+                <td><?php echo (int) $item->id; ?></td>
+            </tr>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+
+    <?php echo $this->pagination->getListFooter(); ?>
+    <input type="hidden" name="boxchecked" value="0">
+    <input type="hidden" name="task" value="">
+    <?php echo HTMLHelper::_('form.token'); ?>
+</form>

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

@@ -0,0 +1,16 @@
+<?php defined('_JEXEC') or die; ?>
+<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'); ?>
+    <div class="mt-3">
+        <button type="submit" class="btn btn-primary" onclick="document.querySelector('#subject-form input[name=task]').value='subject.save';">
+            <?php echo Joomla\CMS\Language\Text::_('JTOOLBAR_SAVE'); ?>
+        </button>
+        <a class="btn btn-secondary" href="index.php?option=com_testquestions&view=subjects">
+            <?php echo Joomla\CMS\Language\Text::_('JTOOLBAR_CANCEL'); ?>
+        </a>
+    </div>
+    <input type="hidden" name="task" value="subject.save">
+    <?php echo Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
+</form>

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

@@ -0,0 +1,24 @@
+<?php defined('_JEXEC') or die; ?>
+<form action="index.php?option=com_testquestions&view=subjects" method="post" name="adminForm" id="adminForm">
+    <table class="table table-striped">
+        <thead><tr>
+            <th><?php echo Joomla\CMS\HTML\HTMLHelper::_('grid.checkall'); ?></th>
+            <th><?php echo Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SUBJECT_TITLE'); ?></th>
+            <th><?php echo Joomla\CMS\Language\Text::_('JSTATUS'); ?></th>
+            <th><?php echo Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_ID'); ?></th>
+        </tr></thead>
+        <tbody>
+        <?php foreach ($this->items as $i => $item) : ?>
+            <tr>
+                <td><?php echo Joomla\CMS\HTML\HTMLHelper::_('grid.id', $i, $item->id); ?></td>
+                <th><a href="index.php?option=com_testquestions&task=subject.edit&id=<?php echo (int) $item->id; ?>"><?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?></a></th>
+                <td><?php echo $item->published ? Joomla\CMS\Language\Text::_('JPUBLISHED') : Joomla\CMS\Language\Text::_('JUNPUBLISHED'); ?></td>
+                <td><?php echo (int) $item->id; ?></td>
+            </tr>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+    <input type="hidden" name="boxchecked" value="0">
+    <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.8.3</version>
+    <version>1.10.2</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>