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.36.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/language/en-GB/com_testquestions.ini

@@ -58,6 +58,10 @@ 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ń"

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

@@ -17,8 +17,83 @@ class SetController extends FormController
         $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

@@ -133,6 +133,10 @@ class SetModel extends AdminModel
 
         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';
         }

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;
@@ -15,6 +16,8 @@ class HtmlView extends BaseHtmlView
     protected $questions;
     protected $categories;
     protected $variants;
+    protected $isVariant;
+    protected $parentTitle = '';
 
     public function display($tpl = null)
     {
@@ -23,6 +26,14 @@ class HtmlView extends BaseHtmlView
         $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));
@@ -36,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/set/edit.php

@@ -8,18 +8,23 @@ 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 ((int) $this->item->parent_id > 0) : ?>
-            <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_PARENT'); ?>: <?php echo $this->escape($this->item->parent_title ?? ''); ?></div>
+        <?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'); ?>
@@ -47,10 +52,14 @@ HTMLHelper::_('behavior.formvalidator');
         <?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>
@@ -120,6 +129,47 @@ HTMLHelper::_('behavior.formvalidator');
     <?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');

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.36.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

@@ -10,6 +10,7 @@ use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 class SetModel extends BaseDatabaseModel
 {
     protected $resolvedSetId;
+    protected $randomizeQuestions = true;
 
     protected function getSetId(): int
     {
@@ -44,6 +45,7 @@ class SetModel extends BaseDatabaseModel
         }
 
         $this->resolvedSetId = $setId;
+        $this->randomizeQuestions = $set->set_type !== 'multi';
 
         if ($set->set_type === 'multi') {
             $variantId = (int) $db->setQuery(
@@ -74,15 +76,16 @@ class SetModel extends BaseDatabaseModel
             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()