wojtek/System-testowy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Order multi-variant questions without frontend randomization

Browse Source
This commit is contained in:
Wojtek
2026-10-16 11:33:58 +02:00
parent 5e12e8838d
commit 53dd9658e8
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -30,6 +30,6 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
## Instalacja ## Instalacja
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.40.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**. Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
administrator/components/com_testquestions/sql/updates/mysql/1.41.0.sql
+1
View File
@@ -0,0 +1 @@
-- No database changes required for version 1.41.0.
administrator/components/com_testquestions/tmpl/set/edit.php
+1 -1
View File
@@ -8,7 +8,7 @@ use Joomla\CMS\Router\Route;
HTMLHelper::_('behavior.formvalidator'); 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"> <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'; ?> <?php $canOrderQuestions = $this->isVariant || (string) $this->item->set_type === 'ordinary'; ?>
<fieldset class="adminform"> <fieldset class="adminform">
<?php echo $this->form->renderField('parent_id'); ?> <?php echo $this->form->renderField('parent_id'); ?>
<?php if ($this->isVariant) : ?> <?php if ($this->isVariant) : ?>
com_testquestions.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<creationDate>2026-10-14</creationDate> <creationDate>2026-10-14</creationDate>
<author>Komponent</author> <author>Komponent</author>
<license>GNU General Public License version 2 or later</license> <license>GNU General Public License version 2 or later</license>
<version>1.40.0</version> <version>1.41.0</version>
<description>COM_TESTQUESTIONS_DESCRIPTION</description> <description>COM_TESTQUESTIONS_DESCRIPTION</description>
<element>com_testquestions</element> <element>com_testquestions</element>
<namespace path="src">Komponent\Component\Testquestions</namespace> <namespace path="src">Komponent\Component\Testquestions</namespace>
components/com_testquestions/src/Model/SetModel.php
+8 -5
View File
@@ -10,6 +10,7 @@ use Joomla\CMS\MVC\Model\BaseDatabaseModel;
class SetModel extends BaseDatabaseModel class SetModel extends BaseDatabaseModel
{ {
protected $resolvedSetId; protected $resolvedSetId;
protected $randomizeQuestions = true;
protected function getSetId(): int protected function getSetId(): int
{ {
@@ -44,6 +45,7 @@ class SetModel extends BaseDatabaseModel
} }
$this->resolvedSetId = $setId; $this->resolvedSetId = $setId;
$this->randomizeQuestions = $set->set_type !== 'multi';
if ($set->set_type === 'multi') { if ($set->set_type === 'multi') {
$variantId = (int) $db->setQuery( $variantId = (int) $db->setQuery(
@@ -74,15 +76,16 @@ class SetModel extends BaseDatabaseModel
return []; return [];
} }
return $db->setQuery( $query = $db->getQuery(true)
$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']) ->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')) ->from($db->quoteName('#__testquestions_set_questions', 'sq'))
->innerJoin($db->quoteName('#__testquestions_questions', 'q') . ' ON q.id = sq.question_id') ->innerJoin($db->quoteName('#__testquestions_questions', 'q') . ' ON q.id = sq.question_id')
->where('sq.set_id = ' . $setId) ->where('sq.set_id = ' . $setId)
->where('q.published = 1') ->where('q.published = 1');
->order('RAND()')
)->loadObjectList(); $query->order($this->randomizeQuestions ? 'RAND()' : 'sq.ordering ASC, q.id ASC');
return $db->setQuery($query)->loadObjectList();
} }
public function getSets() public function getSets()