Order multi-variant questions without frontend randomization

README.md

@@ -30,6 +30,6 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 
 ## Instalacja
 
-W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.32.0).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.41.0).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/forms/set.xml

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

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

@@ -49,6 +49,19 @@ COM_TESTQUESTIONS_SETS="Zestawy pytań"
 COM_TESTQUESTIONS_NEW_SET="Nowy zestaw pytań"
 COM_TESTQUESTIONS_EDIT_SET="Edytuj zestaw pytań"
 COM_TESTQUESTIONS_SET_TITLE="Nazwa zestawu"
+COM_TESTQUESTIONS_SET_TYPE="Rodzaj zestawu"
+COM_TESTQUESTIONS_SET_TYPE_ORDINARY="Zwykły zestaw"
+COM_TESTQUESTIONS_SET_TYPE_MULTI="Zestaw wielowariantowy"
+COM_TESTQUESTIONS_SET_TYPE_VARIANT="Wariant zestawu"
+COM_TESTQUESTIONS_SET_VARIANTS="Warianty zestawu"
+COM_TESTQUESTIONS_SET_ADD_VARIANT="Dodaj wariant"
+COM_TESTQUESTIONS_SET_PARENT="Zestaw nadrzędny"
+COM_TESTQUESTIONS_SET_NO_VARIANTS="Brak wariantów"
+COM_TESTQUESTIONS_SET_MULTI_QUESTIONS_INFO="Pytania są dodawane w poszczególnych wariantach zestawu."
+COM_TESTQUESTIONS_SET_REORDER_INFO="Przeciągnij pytania, aby zmienić ich kolejność."
+COM_TESTQUESTIONS_SET_SAVE="Zapisz"
+COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE="Zapisz i zamknij"
+COM_TESTQUESTIONS_SET_VARIANT_DURATION_INFO="Czas testu jest pobierany z zestawu nadrzędnego."
 COM_TESTQUESTIONS_SET_DESCRIPTION="Opis zestawu"
 COM_TESTQUESTIONS_SET_QUESTIONS="Pytania w zestawie"
 COM_TESTQUESTIONS_SET_QUESTION_COUNT="Liczba pytań"
@@ -68,6 +81,7 @@ COM_TESTQUESTIONS_RESULT_NOT_FOUND="Nie znaleziono zapisanego testu."
 COM_TESTQUESTIONS_RESULT_PARTICIPANT="Użytkownik"
 COM_TESTQUESTIONS_RESULT_SCORE="Wynik"
 COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER="Punkty przed / po korekcie"
+COM_TESTQUESTIONS_RESULT_GRADE="Ocena"
 COM_TESTQUESTIONS_RESULT_DATE="Data zakończenia"
 COM_TESTQUESTIONS_RESULT_ANSWERS="Odpowiedzi"
 COM_TESTQUESTIONS_RESULT_EXECUTION_TIME="Czas wykonania"

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

@@ -40,6 +40,8 @@ VALUES (1, 'Bez kategorii', 1, 0);
 
 CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `parent_id` int unsigned NOT NULL DEFAULT 0,
+  `set_type` varchar(12) NOT NULL DEFAULT 'ordinary',
   `subject_id` int unsigned NOT NULL DEFAULT 0,
   `title` varchar(255) NOT NULL,
   `duration` smallint unsigned NOT NULL DEFAULT 0,
@@ -54,6 +56,7 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   `modified_by` int unsigned NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   KEY `idx_published` (`published`),
+  KEY `idx_parent_id` (`parent_id`),
   KEY `idx_ordering` (`ordering`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -11,8 +11,89 @@ class SetController extends FormController
     protected $view_item = 'set';
     protected $view_list = 'sets';
 
+    public function addvariant(): void
+    {
+        $parentId = $this->input->getInt('parent_id');
+        $this->setRedirect('index.php?option=com_testquestions&view=set&layout=edit&parent_id=' . $parentId);
+    }
+
+    public function save2close($key = null, $urlVar = null)
+    {
+        $formData = (array) $this->input->post->get('jform', [], 'array');
+        $parentId = (int) ($formData['parent_id'] ?? 0);
+        $itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
+        $result = parent::save2close($key, $urlVar);
+
+        if ($result) {
+            if ($itemId > 0) {
+                $item = $this->getModel()->getItem($itemId);
+                $parentId = (int) ($item->parent_id ?? $parentId);
+            }
+
+            if ($parentId > 0) {
+                $this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $parentId);
+            }
+        }
+
+        return $result;
+    }
+
+    public function save($key = null, $urlVar = null)
+    {
+        $formData = (array) $this->input->post->get('jform', [], 'array');
+        $result = parent::save($key, $urlVar);
+        $itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
+
+        if ($result && $itemId > 0) {
+            $this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $itemId);
+        }
+
+        return $result;
+    }
+
+    public function saveandclose($key = null, $urlVar = null)
+    {
+        $formData = (array) $this->input->post->get('jform', [], 'array');
+        $parentId = (int) ($formData['parent_id'] ?? 0);
+        $result = parent::save($key, $urlVar);
+        $itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
+
+        if ($result && $itemId > 0 && $parentId < 1) {
+            $item = $this->getModel()->getItem($itemId);
+            $parentId = (int) ($item->parent_id ?? 0);
+        }
+
+        if ($result) {
+            $this->setRedirect(
+                $parentId > 0
+                    ? 'index.php?option=com_testquestions&task=set.edit&id=' . $parentId
+                    : 'index.php?option=com_testquestions&view=sets'
+            );
+        }
+
+        return $result;
+    }
+
     public function cancel($key = null)
     {
+        $parentId = $this->input->getInt('parent_id');
+        $formData = (array) $this->input->post->get('jform', [], 'array');
+        $parentId = (int) ($formData['parent_id'] ?? $parentId);
+
+        if ($parentId < 1) {
+            $itemId = $this->input->getInt('id');
+            if ($itemId > 0) {
+                $item = $this->getModel()->getItem($itemId);
+                $parentId = (int) ($item->parent_id ?? 0);
+            }
+        }
+
+        if ($parentId > 0) {
+            $this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $parentId);
+
+            return true;
+        }
+
         $this->setRedirect('index.php?option=com_testquestions&view=sets');
 
         return true;

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

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

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

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

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

@@ -4,6 +4,7 @@ namespace Komponent\Component\Testquestions\Administrator\View\Set;
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -14,6 +15,9 @@ class HtmlView extends BaseHtmlView
     protected $item;
     protected $questions;
     protected $categories;
+    protected $variants;
+    protected $isVariant;
+    protected $parentTitle = '';
 
     public function display($tpl = null)
     {
@@ -21,6 +25,15 @@ class HtmlView extends BaseHtmlView
         $this->item = $this->get('Item');
         $this->questions = $this->get('Questions');
         $this->categories = $this->get('Categories');
+        $this->variants = $this->item && (int) $this->item->id > 0 ? $this->get('Variants') : [];
+        $parentId = Factory::getApplication()->getInput()->getInt('parent_id');
+        $this->isVariant = (int) ($this->item->parent_id ?? 0) > 0 || $parentId > 0;
+        $this->parentTitle = (string) ($this->item->parent_title ?? '');
+
+        if ($this->isVariant && $this->parentTitle === '' && $parentId > 0) {
+            $parent = $this->getModel()->getItem($parentId);
+            $this->parentTitle = (string) ($parent->title ?? '');
+        }
 
         if (count($errors = $this->get('Errors'))) {
             throw new \RuntimeException(implode("\n", $errors));
@@ -34,8 +47,8 @@ class HtmlView extends BaseHtmlView
     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::custom('set.save', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE', false);
+        ToolbarHelper::custom('set.saveandclose', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE', false);
         ToolbarHelper::cancel('set.cancel', 'JTOOLBAR_CANCEL');
     }
 }

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

@@ -13,6 +13,14 @@
         <dd class="col-sm-9"><?php echo (int) $this->item->correct_count; ?> / <?php echo (int) $this->item->total_count; ?> (<?php echo htmlspecialchars((string) $this->item->percentage, ENT_QUOTES, 'UTF-8'); ?>%)</dd>
         <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER'); ?></dt>
         <dd class="col-sm-9"><?php echo (int) $this->item->points_before; ?> / <?php echo (int) $this->item->points_after; ?></dd>
+        <?php $pointsTotal = (int) $this->item->points_total ?: (int) $this->item->total_count; ?>
+        <?php $pointsAfterPercentage = $pointsTotal ? round(((int) $this->item->points_after / $pointsTotal) * 100, 2) : 0; ?>
+        <?php $grade = 'NDST'; ?>
+        <?php foreach ([['CEL', 100], ['BDB', 90], ['BDB-', 80], ['DB+', 75], ['DB', 70], ['DB-', 65], ['DST+', 60], ['DST', 55], ['DST-', 50], ['DOP+', 45], ['DOP', 40], ['DOP-', 35], ['NDST+', 30], ['NDST', 0]] as $gradeScale) : ?>
+            <?php if ($pointsAfterPercentage >= $gradeScale[1]) { $grade = $gradeScale[0]; break; } ?>
+        <?php endforeach; ?>
+        <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_GRADE'); ?></dt>
+        <dd class="col-sm-9"><?php echo $this->escape($grade); ?></dd>
         <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_EXECUTION_TIME'); ?></dt>
         <dd class="col-sm-9"><?php echo floor((int) $this->item->execution_time / 60); ?>:<?php echo str_pad((string) ((int) $this->item->execution_time % 60), 2, '0', STR_PAD_LEFT); ?></dd>
     </dl>

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

@@ -38,6 +38,7 @@ use Joomla\CMS\Router\Route;
             <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_PARTICIPANT'); ?></th>
             <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></th>
             <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER'); ?></th>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_GRADE'); ?></th>
             <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_EXECUTION_TIME'); ?></th>
             <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_DATE'); ?></th>
         </tr></thead>
@@ -49,7 +50,12 @@ use Joomla\CMS\Router\Route;
                 <?php $pointsTotal = (int) $item->points_total ?: (int) $item->total_count; ?>
                 <?php $pointsBeforePercentage = $pointsTotal ? round(((int) $item->points_before / $pointsTotal) * 100, 2) : 0; ?>
                 <?php $pointsAfterPercentage = $pointsTotal ? round(((int) $item->points_after / $pointsTotal) * 100, 2) : 0; ?>
+                <?php $grade = 'NDST'; ?>
+                <?php foreach ([['CEL', 100], ['BDB', 90], ['BDB-', 80], ['DB+', 75], ['DB', 70], ['DB-', 65], ['DST+', 60], ['DST', 55], ['DST-', 50], ['DOP+', 45], ['DOP', 40], ['DOP-', 35], ['NDST+', 30], ['NDST', 0]] as $gradeScale) : ?>
+                    <?php if ($pointsAfterPercentage >= $gradeScale[1]) { $grade = $gradeScale[0]; break; } ?>
+                <?php endforeach; ?>
                 <td><?php echo (int) $item->points_before; ?> (<?php echo $pointsBeforePercentage; ?>%) / <?php echo (int) $item->points_after; ?> (<?php echo $pointsAfterPercentage; ?>%)</td>
+                <td><?php echo $this->escape($grade); ?></td>
                 <td><?php echo floor((int) $item->execution_time / 60); ?>:<?php echo str_pad((string) ((int) $item->execution_time % 60), 2, '0', STR_PAD_LEFT); ?></td>
                 <td><?php echo HTMLHelper::_('date', $item->created, 'Y-m-d H:i'); ?></td>
             </tr>

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

@@ -8,21 +8,58 @@ 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">
+    <?php $canOrderQuestions = $this->isVariant || (string) $this->item->set_type === 'ordinary'; ?>
     <fieldset class="adminform">
+        <?php echo $this->form->renderField('parent_id'); ?>
+        <?php if ($this->isVariant) : ?>
+            <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_PARENT'); ?>: <?php echo $this->escape($this->parentTitle); ?></div>
+            <input type="hidden" name="jform[set_type]" value="variant">
+        <?php else : ?>
+            <?php echo $this->form->renderField('set_type'); ?>
+        <?php endif; ?>
         <?php echo $this->form->renderField('title'); ?>
         <?php echo $this->form->renderField('subject_id'); ?>
-        <?php echo $this->form->renderField('duration'); ?>
-        <output id="set-duration-value" class="form-text mb-3"></output>
+        <?php if (!$this->isVariant) : ?>
+            <?php echo $this->form->renderField('duration'); ?>
+            <output id="set-duration-value" class="form-text mb-3"></output>
+        <?php else : ?>
+            <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANT_DURATION_INFO'); ?></div>
+        <?php endif; ?>
         <?php echo $this->form->renderField('test_content'); ?>
         <?php echo $this->form->renderField('image'); ?>
         <?php echo $this->form->renderField('description'); ?>
         <?php echo $this->form->renderField('published'); ?>
+        <?php if ((int) $this->item->id > 0 && (string) $this->item->set_type === 'multi') : ?>
+            <fieldset class="mb-3">
+                <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANTS'); ?></legend>
+                <?php if ($this->variants) : ?>
+                    <ul class="list-group mb-3">
+                        <?php foreach ($this->variants as $variant) : ?>
+                            <li class="list-group-item d-flex justify-content-between align-items-center">
+                                <a href="<?php echo Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $variant->id); ?>"><?php echo $this->escape($variant->title); ?></a>
+                                <span class="badge <?php echo (int) $variant->published ? 'bg-success' : 'bg-secondary'; ?>"><?php echo (int) $variant->published ? \Joomla\CMS\Language\Text::_('JPUBLISHED') : \Joomla\CMS\Language\Text::_('JUNPUBLISHED'); ?></span>
+                            </li>
+                        <?php endforeach; ?>
+                    </ul>
+                <?php else : ?>
+                    <p><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_NO_VARIANTS'); ?></p>
+                <?php endif; ?>
+                <a class="btn btn-secondary" href="<?php echo Route::_('index.php?option=com_testquestions&task=set.addvariant&parent_id=' . (int) $this->item->id); ?>">
+                    <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_ADD_VARIANT'); ?>
+                </a>
+            </fieldset>
+        <?php endif; ?>
+        <?php if (!((string) $this->item->set_type === 'multi' && (int) $this->item->parent_id === 0)) : ?>
         <fieldset class="mb-3">
             <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SELECTED_QUESTIONS'); ?></legend>
-            <div id="set-selected-question-list" class="border rounded p-3">
-                <?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-question-row">
+            <?php if ($canOrderQuestions) : ?>
+                <div class="form-text mb-2"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_REORDER_INFO'); ?></div>
+            <?php endif; ?>
+            <div id="set-selected-question-list" class="border rounded p-3" data-sortable="<?php echo $canOrderQuestions ? '1' : '0'; ?>">
+                <?php $questionsById = []; foreach ($this->questions as $availableQuestion) : $questionsById[(int) $availableQuestion->id] = $availableQuestion; endforeach; ?>
+                <?php foreach ((array) $this->item->question_ids as $selectedQuestionId) : ?>
+                    <?php $question = $questionsById[(int) $selectedQuestionId] ?? null; if (!$question) continue; ?>
+                    <div class="form-check set-question-row"<?php echo $canOrderQuestions ? ' draggable="true"' : ''; ?>>
                         <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>
@@ -82,11 +119,57 @@ HTMLHelper::_('behavior.formvalidator');
                 <?php endforeach; ?>
             </div>
         </fieldset>
+        <?php else : ?>
+            <div class="alert alert-info">
+                <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_MULTI_QUESTIONS_INFO'); ?>
+            </div>
+        <?php endif; ?>
     </fieldset>
     <input type="hidden" name="task" value="">
     <?php echo HTMLHelper::_('form.token'); ?>
 </form>
 <script>
+document.addEventListener('DOMContentLoaded', function () {
+    const list = document.getElementById('set-selected-question-list');
+
+    if (!list || list.dataset.sortable !== '1') {
+        return;
+    }
+
+    let dragged = null;
+
+    list.querySelectorAll('.set-question-row[draggable="true"]').forEach(function (row) {
+        row.addEventListener('dragstart', function (event) {
+            dragged = row;
+            row.classList.add('opacity-50');
+            event.dataTransfer.effectAllowed = 'move';
+        });
+
+        row.addEventListener('dragend', function () {
+            row.classList.remove('opacity-50');
+            dragged = null;
+        });
+
+        row.addEventListener('dragover', function (event) {
+            event.preventDefault();
+            event.dataTransfer.dropEffect = 'move';
+        });
+
+        row.addEventListener('drop', function (event) {
+            event.preventDefault();
+
+            if (!dragged || dragged === row) {
+                return;
+            }
+
+            const rect = row.getBoundingClientRect();
+            const insertAfter = event.clientY > rect.top + rect.height / 2;
+            list.insertBefore(dragged, insertAfter ? row.nextSibling : row);
+        });
+    });
+});
+</script>
+<script>
 document.addEventListener('DOMContentLoaded', function () {
     const filter = document.getElementById('set-question-category');
     const rows = document.querySelectorAll('.set-available-question-row');

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

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

com_testquestions.xml

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

components/com_testquestions/src/Model/SetModel.php

@@ -9,6 +9,9 @@ use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 
 class SetModel extends BaseDatabaseModel
 {
+    protected $resolvedSetId;
+    protected $randomizeQuestions = true;
+
     protected function getSetId(): int
     {
         $application = Factory::getApplication();
@@ -27,34 +30,62 @@ class SetModel extends BaseDatabaseModel
             return null;
         }
 
-        return $db->setQuery(
+        $set = $db->setQuery(
             $db->getQuery(true)
                 ->select(['s.*', 'sub.title AS subject_title'])
                 ->from($db->quoteName('#__testquestions_sets', 's'))
                 ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
                 ->where('s.id = ' . $setId)
+                ->where('s.parent_id = 0')
                 ->where('s.published = 1')
         )->loadObject();
+
+        if (!$set) {
+            return null;
+        }
+
+        $this->resolvedSetId = $setId;
+        $this->randomizeQuestions = $set->set_type !== 'multi';
+
+        if ($set->set_type === 'multi') {
+            $variantId = (int) $db->setQuery(
+                $db->getQuery(true)
+                    ->select('id')
+                    ->from($db->quoteName('#__testquestions_sets'))
+                    ->where('parent_id = ' . $setId)
+                    ->where('published = 1')
+                    ->order('RAND()')
+                    ->setLimit(1)
+            )->loadResult();
+
+            $this->resolvedSetId = $variantId;
+        }
+
+        return $set;
     }
 
     public function getItems()
     {
         $db = Factory::getContainer()->get('DatabaseDriver');
-        $setId = $this->getSetId();
+        if ($this->resolvedSetId === null) {
+            $this->getSet();
+        }
+        $setId = (int) $this->resolvedSetId;
 
         if ($setId < 1) {
             return [];
         }
 
-        return $db->setQuery(
-            $db->getQuery(true)
+        $query = $db->getQuery(true)
                 ->select(['q.id', 'q.question_type', 'q.question', 'q.answer_a', 'q.answer_b', 'q.answer_c', 'q.answer_d', 'q.answer_open', 'q.correct_answer', 'q.points', 'q.image'])
                 ->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();
+                ->where('q.published = 1');
+
+        $query->order($this->randomizeQuestions ? 'RAND()' : 'sq.ordering ASC, q.id ASC');
+
+        return $db->setQuery($query)->loadObjectList();
     }
 
     public function getSets()
@@ -67,6 +98,7 @@ class SetModel extends BaseDatabaseModel
                 ->from($db->quoteName('#__testquestions_sets', 's'))
                 ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
                 ->where('s.published = 1')
+                ->where('s.parent_id = 0')
                 ->order('sub.title ASC, s.title ASC')
         )->loadObjectList();
     }