Rename answer preview label

README.md

@@ -13,14 +13,16 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - frontendowy widok pytań filtrowany po symbolu arkusza egzaminacyjnego,
 - 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,
 - opcjonalny symbol testu, rok egzaminu i numer pytania z arkusza,
 - 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.6.3).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.9.4).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/forms/set.xml

@@ -0,0 +1,12 @@
+<?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="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/language/en-GB/com_testquestions.ini

@@ -45,3 +45,15 @@ 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"

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

@@ -37,3 +37,26 @@ 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,
+  `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_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,3 @@
+DROP TABLE IF EXISTS `#__testquestions_set_questions`;
+DROP TABLE IF EXISTS `#__testquestions_sets`;
 DROP TABLE IF EXISTS `#__testquestions_questions`;

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

@@ -0,0 +1 @@
+-- Add client-side test completion and result calculation.

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `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_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/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,40 @@
+<?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.*', 'COUNT(sq.question_id) AS question_count'])
+            ->from($db->quoteName('#__testquestions_sets', 's'))
+            ->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/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/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,54 @@
+<?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'
+        );
+    }
+}

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

@@ -0,0 +1,70 @@
+<?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('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,55 @@
+<?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" 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 (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>

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.6.3</version>
+    <version>1.9.4</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>
@@ -13,6 +13,9 @@
         <folder>tmpl</folder>
         <folder>language</folder>
     </files>
+    <media destination="com_testquestions" folder="components/com_testquestions/media">
+        <filename>egzamin.css</filename>
+    </media>
     <administration>
         <menu link="index.php?option=com_testquestions&amp;view=questions">COM_TESTQUESTIONS</menu>
         <files folder="administrator/components/com_testquestions">

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

@@ -6,6 +6,13 @@ COM_TESTQUESTIONS_NO_TEST_QUESTIONS="Nie znaleziono pytań dla podanego arkusza.
 COM_TESTQUESTIONS_TEST_SHEET="Arkusz"
 COM_TESTQUESTIONS_TIME_LIMIT="Czas"
 COM_TESTQUESTIONS_POINTS="Punkty"
+COM_TESTQUESTIONS_FINISH_TEST="Zakończ test"
+COM_TESTQUESTIONS_RESULT="Wynik"
+COM_TESTQUESTIONS_ANSWER_CORRECT="Poprawna odpowiedź"
+COM_TESTQUESTIONS_ANSWER_INCORRECT="Niepoprawna odpowiedź"
+COM_TESTQUESTIONS_CORRECT_ANSWER="Poprawna odpowiedź"
+COM_TESTQUESTIONS_CORRECT_PATTERN="Wzorzec poprawnej odpowiedzi"
+COM_TESTQUESTIONS_SELECTED_ANSWER="Zaznaczona odpowiedź"
 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."

components/com_testquestions/media/egzamin.css

@@ -0,0 +1,186 @@
+.com-testquestions {
+    width: 100%;
+    max-width: 100%;
+    box-sizing: border-box;
+}
+
+.com-testquestions .testquestion {
+    display: block;
+    width: 100%;
+    max-width: 100%;
+    box-sizing: border-box;
+}
+
+.com-testquestions .timer-container {
+    position: relative;
+    width: 120px;
+    height: 120px;
+    margin: auto;
+}
+
+.com-testquestions .timer-text {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    font-size: 24px;
+    color: #003366;
+    font-weight: bold;
+}
+
+.com-testquestions .progress-ring__circle {
+    transition: stroke-dashoffset 1s linear;
+    transform: rotate(-90deg);
+    transform-origin: 50% 50%;
+}
+
+.com-testquestions .foto_pyt {
+    margin: 5px auto;
+    border: 2px #d4d4d4 none;
+    border-radius: 4px;
+    width: 98%;
+    padding: 5px;
+    text-align: center;
+}
+
+.com-testquestions .foto_pyt img {
+    max-width: 100%;
+    height: auto;
+}
+
+.com-testquestions .pyt {
+    background-color: #4a86cf;
+    font-size: 18px;
+    margin: 25px 5px 11px;
+    border: 1px #dfe3e7 solid;
+    border-radius: .25rem;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 10px;
+    text-align: left;
+    color: white;
+    box-shadow: 4px 4px 4px rgba(0, 0, 0, .4);
+}
+
+.com-testquestions .pyt h2 {
+    margin: 0;
+    color: inherit;
+    font-size: inherit;
+}
+
+.com-testquestions .question-header {
+    display: flex;
+    align-items: flex-start;
+    gap: .25rem;
+}
+
+.com-testquestions .question-number {
+    flex: 0 0 auto;
+    white-space: nowrap;
+    font-weight: 700;
+}
+
+.com-testquestions .question-text {
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+.com-testquestions .question-text > :first-child {
+    margin-top: 0;
+}
+
+.com-testquestions .question-text > :last-child {
+    margin-bottom: 0;
+}
+
+.com-testquestions .odp,
+.com-testquestions .odpp,
+.com-testquestions .odpu,
+.com-testquestions .odpup {
+    font-size: 16px;
+    margin: 5px;
+    border: 1px #dfe3e7 solid;
+    border-radius: .25rem;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 10px;
+    text-align: left;
+    box-shadow: 2px 2px 2px rgba(0, 0, 0, .2);
+}
+
+.com-testquestions .odp {
+    color: #4a86cf;
+}
+
+.com-testquestions .odpp {
+    background-color: #dfdfdf;
+    border-color: #777;
+    color: #0000ff;
+}
+
+.com-testquestions .odpu {
+    background-color: #ff0000;
+    color: #fff;
+}
+
+.com-testquestions .odpup {
+    background-color: #02f002;
+    color: #000;
+}
+
+.com-testquestions .odp p,
+.com-testquestions .odpp p,
+.com-testquestions .odpu p,
+.com-testquestions .odpup p,
+.com-testquestions .odp input,
+.com-testquestions .odpp input,
+.com-testquestions .odpu input,
+.com-testquestions .odpup input {
+    margin: 0;
+}
+
+.com-testquestions .answer-list {
+    padding: 0;
+    list-style: none;
+}
+
+.com-testquestions .answer-list label {
+    display: flex;
+    align-items: flex-start;
+    gap: .25rem;
+    cursor: pointer;
+}
+
+.com-testquestions .answer-list label input {
+    flex: 0 0 auto;
+    margin-top: .25rem;
+}
+
+.com-testquestions .answer-text {
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+.com-testquestions select.egzamin {
+    color: #4a86cf;
+    padding: 5px;
+    border: solid 1px #dfe3e7;
+    border-radius: .25rem;
+    width: 100%;
+    margin-bottom: 3px;
+    box-shadow: 4px 4px 4px rgba(0, 0, 0, .4);
+}
+
+.com-testquestions input.egzamin {
+    color: white;
+    background: #4a86cf;
+    padding: 5px;
+    border: solid 1px #dfe3e7;
+    border-radius: .25rem;
+    margin: 3px 10px 5px 0;
+    box-shadow: 4px 4px 4px rgba(0, 0, 0, .4);
+}
+
+.com-testquestions .test-result {
+    margin: 15px 5px;
+}

components/com_testquestions/src/Controller/DisplayController.php

@@ -5,8 +5,18 @@ namespace Komponent\Component\Testquestions\Site\Controller;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Session\Session;
 
 class DisplayController extends BaseController
 {
     protected $default_view = 'questions';
+
+    public function check()
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException('Invalid token', 403);
+        }
+
+        return $this->display();
+    }
 }

components/com_testquestions/src/Model/QuestionsModel.php

@@ -16,13 +16,14 @@ class QuestionsModel extends ListModel
         $menuSymbol = $menu ? (string) $menu->getParams()->get('test_symbol', '') : '';
         $symbol = Factory::getApplication()->getInput()->getString('test_symbol', $menuSymbol);
         $this->setState('filter.test_symbol', trim($symbol));
+        $this->setState('list.limit', 0);
     }
 
     protected function getListQuery()
     {
         $db = Factory::getContainer()->get('DatabaseDriver');
         $query = $db->getQuery(true)
-            ->select(['question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'image', 'time_limit', 'points'])
+            ->select(['id', 'test_symbol', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'image', 'time_limit', 'points'])
             ->from($db->quoteName('#__testquestions_questions'))
             ->where($db->quoteName('published') . ' = 1')
             ->order($db->quoteName('ordering') . ' ASC, ' . $db->quoteName('id') . ' ASC');

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

@@ -5,12 +5,14 @@ namespace Komponent\Component\Testquestions\Site\View\Questions;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Factory;
 
 class HtmlView extends BaseHtmlView
 {
     protected $items;
     protected $symbol;
     protected $symbols;
+    protected $results;
 
     public function formatSheetLabel($sheet)
     {
@@ -40,9 +42,60 @@ class HtmlView extends BaseHtmlView
 
     public function display($tpl = null)
     {
+        $this->getDocument()->getWebAssetManager()->registerAndUseStyle(
+            'com_testquestions.exam',
+            'media/com_testquestions/egzamin.css'
+        );
         $this->items = $this->get('Items');
         $this->symbol = $this->get('State')->get('filter.test_symbol');
         $this->symbols = $this->get('TestSymbols');
+        $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/questions/default.php

@@ -4,18 +4,18 @@ defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
 ?>
-<div class="com-testquestions">
+<div class="com-testquestions egzamin">
     <h1><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS'); ?></h1>
     <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="get" class="mb-4">
         <label for="test-symbol" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_TEST_SYMBOL'); ?></label>
         <div class="input-group">
-            <select id="test-symbol" name="test_symbol" class="form-select" required>
+            <select id="test-symbol" name="test_symbol" class="form-select egzamin" required>
                 <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECT_TEST_SYMBOL'); ?></option>
                 <?php foreach ($this->symbols as $symbol) : ?>
                     <option value="<?php echo htmlspecialchars($symbol->test_symbol, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $this->symbol === $symbol->test_symbol ? 'selected' : ''; ?>><?php echo htmlspecialchars($this->formatSheetLabel($symbol), ENT_QUOTES, 'UTF-8'); ?></option>
                 <?php endforeach; ?>
             </select>
-            <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SHOW_TEST'); ?></button>
+            <input type="submit" class="egzamin" value="<?php echo htmlspecialchars(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SHOW_TEST'), ENT_QUOTES, 'UTF-8'); ?>">
         </div>
     </form>
 
@@ -23,29 +23,69 @@ use Joomla\CMS\HTML\HTMLHelper;
         <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECT_TEST_SYMBOL'); ?></div>
     <?php elseif ($this->symbol !== '') : ?>
         <h2><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_TEST_SHEET'); ?>: <?php echo htmlspecialchars($this->symbol, ENT_QUOTES, 'UTF-8'); ?></h2>
+        <?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 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">
-            <h2><?php echo ($number + 1) . '. '; ?><?php echo $item->question; ?></h2>
+            <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) : ?>
-                <img src="<?php echo htmlspecialchars($item->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy">
+                <div class="foto_pyt"><img src="<?php echo htmlspecialchars($item->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div>
             <?php endif; ?>
-            <p class="small text-muted">
-                <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_TIME_LIMIT'); ?>: <?php echo (int) $item->time_limit; ?> s |
-                <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_POINTS'); ?>: <?php echo (int) $item->points; ?>
-            </p>
             <?php if ($item->question_type === 'open') : ?>
+                <div class="<?php echo $this->results ? ($this->results['items'][$item->id]['correct'] ? 'odpup' : 'odpu') : 'odp'; ?>">
                     <label for="answer-<?php echo (int) $number; ?>"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ENTER_ANSWER'); ?></label>
-                <input type="text" id="answer-<?php echo (int) $number; ?>" name="answers[<?php echo (int) $number; ?>]" class="form-control">
+                    <input type="text" id="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">
+            <ol type="A" class="answer-list">
-                <li><?php echo $item->answer_a; ?></li>
+                <?php foreach (['answer_a', 'answer_b', 'answer_c', 'answer_d'] as $answerIndex => $answerField) : ?>
-                <li><?php echo $item->answer_b; ?></li>
+                    <?php $isSelected = $this->results && $this->results['items'][$item->id]['selected'] === (string) ($answerIndex + 1); ?>
-                <li><?php echo $item->answer_c; ?></li>
+                    <?php $isCorrectAnswer = $this->results && (string) $item->correct_answer === (string) ($answerIndex + 1); ?>
-                <li><?php echo $item->answer_d; ?></li>
+                    <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>
+                            <?php if ($isSelected) : ?>
+                                <span class="badge bg-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECTED_ANSWER'); ?></span>
+                            <?php endif; ?>
+                            <?php if ($isCorrectAnswer) : ?>
+                                <span class="badge bg-success"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_ANSWER'); ?></span>
+                            <?php endif; ?>
+                        </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="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; ?>
 </div>

egzamin.css

@@ -0,0 +1,177 @@
+.timer-container {
+	position: relative;
+	width: 120px;
+	height: 120px;
+	margin: auto;
+  }
+  
+  .timer-text {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	font-size: 24px;
+	color: #003366;
+	font-weight: bold;
+  }
+  
+  .progress-ring__circle {
+	transition: stroke-dashoffset 1s linear;
+	transform: rotate(-90deg);
+	transform-origin: 50% 50%;
+  }
+div.foto_pyt
+	{
+	  margin:5px;
+	  margin-left:auto;
+	  margin-right:auto;
+	  border:2px #d4d4d4 none;
+	  border-radius:4px;
+	  width:98%;
+	  padding: 5px;
+	  
+	}
+div.pyt
+	{
+	  background-color:#4a86cf;
+	  font-size: 18px;
+	  margin:25px 5px 11px 5px;
+	  border:1px #dfe3e7 solid;
+	  border-radius: .25rem;
+	  width:98%;
+	  padding: 10px;
+	  text-align:left;
+	  color:white;
+	  box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.4);
+	}
+div.odp
+	{
+	  font-size:16px;
+	  margin:5px 5px 5px 5px;
+	  border:1px #dfe3e7 solid;
+	  border-radius: .25rem;;
+	  width:98%;
+	  padding: 10px;
+	  text-align:left;
+	  color: #4a86cf;
+	  box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.2);
+	}
+	
+div.pyt p, div.odp p,div.odpp p, div.odp input,div.odpp input,div.odpup input{
+  margin: 0px;
+}
+
+div.odpp
+	{
+	  background-color:#dfdfdf;
+	  font-size:16px;
+	  margin:5px 5px 5px 5px;
+	  border:1px #777 solid;
+	  border-radius:4px;
+	  width:98%;
+	  padding: 10px;
+	  text-align:left;
+	  color:blue;
+	box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.2);
+	}
+div.odpu
+	{
+	  background-color:#ff0000;
+	  font-size:16px;
+	  margin:5px 5px 5px 5px;
+	  border:1px #dfe3e7 solid;
+	  border-radius:4px;
+	  width:98%;
+	  padding: 10px;
+	  text-align:left;
+	  box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.2);
+	}
+div.odpup
+	{
+	  background-color:#02f002;
+	  font-size:16px;
+	  margin:5px 5px 5px 5px;
+	  border:1px #dfe3e7 solid;
+	  border-radius:4px;
+	  width:98%;
+	  padding: 10px;
+	  text-align:left;
+	  box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.2);
+	}
+
+	select.egzamin
+	{
+		color:#4a86cf;
+		padding:5px;
+		border: solid 1px #dfe3e7;
+		border-radius: .25rem; 
+		width: -moz-available;
+		width: -webkit-fill-available;
+		margin-bottom: 3px;
+		box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.4);
+	}
+	input.egzamin
+	{
+		color: white;
+		background: #4a86cf;
+		padding:5px;
+		border: solid 1px #dfe3e7;
+		border-radius: .25rem; 
+		margin-top: 3px;
+		margin-bottom:5px;
+		margin-right:10px;
+		box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.4);
+	}
+	input#login{
+		box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.4);
+		margin-right:10px;
+	    
+	}
+.com-testquestions {
+    width: 100%;
+    max-width: 100%;
+    box-sizing: border-box;
+}
+
+.com-testquestions .testquestion {
+    display: block;
+    width: 100%;
+    max-width: 100%;
+    box-sizing: border-box;
+}
+
+.com-testquestions .pyt,
+.com-testquestions .odp,
+.com-testquestions .odpp,
+.com-testquestions .odpu,
+.com-testquestions .odpup {
+    box-sizing: border-box;
+}
+
+.com-testquestions .question-header {
+    display: flex;
+    align-items: flex-start;
+    gap: .25rem;
+}
+
+.com-testquestions .question-number {
+    flex: 0 0 auto;
+    white-space: nowrap;
+    font-weight: 700;
+}
+
+.com-testquestions .question-text {
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+.com-testquestions .answer-list label {
+    display: flex;
+    align-items: flex-start;
+    gap: .25rem;
+}
+
+.com-testquestions .answer-text {
+    flex: 1 1 auto;
+    min-width: 0;
+}