Order multi-variant questions without frontend randomization

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('RAND()')
-        )->loadObjectList();
+                ->where('q.published = 1');
+
+        $query->order($this->randomizeQuestions ? 'RAND()' : 'sq.ordering ASC, q.id ASC');
+
+        return $db->setQuery($query)->loadObjectList();
     }
 
     public function getSets()