Add configurable subjects to question sets

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

@@ -20,8 +20,9 @@ class SetsModel extends ListModel
     {
         $db = Factory::getContainer()->get('DatabaseDriver');
         $query = $db->getQuery(true)
-            ->select(['s.*', 'COUNT(sq.question_id) AS question_count'])
+            ->select(['s.*', 'sub.title AS subject_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_set_questions', 'sq') . ' ON sq.set_id = s.id')
             ->group('s.id');
 

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

@@ -0,0 +1,26 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\AdminModel;
+
+class SubjectModel extends AdminModel
+{
+    public function getTable($name = 'Subject', $prefix = 'Administrator', $config = [])
+    {
+        return $this->getMVCFactory()->createTable($name, $prefix, $config);
+    }
+
+    public function getForm($data = [], $loadData = true)
+    {
+        return $this->loadForm('com_testquestions.subject', 'subject', ['control' => 'jform', 'load_data' => $loadData]);
+    }
+
+    protected function loadFormData()
+    {
+        return Factory::getApplication()->getUserState('com_testquestions.edit.subject.data', []) ?: $this->getItem();
+    }
+}

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

@@ -0,0 +1,21 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\ListModel;
+
+class SubjectsModel extends ListModel
+{
+    protected function getListQuery()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->getQuery(true)
+            ->select('*')
+            ->from($db->quoteName('#__testquestions_subjects'))
+            ->order($db->quoteName('ordering') . ' ASC, ' . $db->quoteName('title') . ' ASC');
+    }
+}