Add configurable subjects to question sets

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\FormController;
+
+class SubjectController extends FormController
+{
+    protected $view_item = 'subject';
+    protected $view_list = 'subjects';
+
+    public function cancel($key = null)
+    {
+        $this->setRedirect('index.php?option=com_testquestions&view=subjects');
+
+        return true;
+    }
+}

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

@@ -0,0 +1,17 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\AdminController;
+
+class SubjectsController extends AdminController
+{
+    protected $text_prefix = 'COM_TESTQUESTIONS';
+
+    public function getModel($name = 'Subject', $prefix = 'Administrator', $config = ['ignore_request' => true])
+    {
+        return parent::getModel($name, $prefix, $config);
+    }
+}

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');
+    }
+}

administrator/components/com_testquestions/src/Table/SubjectTable.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Table;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Table\Table;
+use Joomla\Database\DatabaseDriver;
+
+class SubjectTable extends Table
+{
+    public function __construct(DatabaseDriver $db)
+    {
+        parent::__construct('#__testquestions_subjects', 'id', $db);
+    }
+
+    public function check($updateNulls = false): bool
+    {
+        $this->title = trim((string) $this->title);
+
+        return $this->title !== '' && parent::check($updateNulls);
+    }
+}

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

@@ -50,5 +50,10 @@ class HtmlView extends BaseHtmlView
             'COM_TESTQUESTIONS_QUESTIONS',
             'list'
         );
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=subjects',
+            'COM_TESTQUESTIONS_SUBJECTS',
+            'list'
+        );
     }
 }

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

@@ -0,0 +1,26 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Subject;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $form;
+    protected $item;
+
+    public function display($tpl = null)
+    {
+        $this->form = $this->get('Form');
+        $this->item = $this->get('Item');
+        ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SUBJECT') : Text::_('COM_TESTQUESTIONS_NEW_SUBJECT'));
+        ToolbarHelper::save('subject.save', 'JTOOLBAR_SAVE');
+        ToolbarHelper::cancel('subject.cancel', 'JTOOLBAR_CANCEL');
+
+        return parent::display($tpl);
+    }
+}

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

@@ -0,0 +1,27 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Subjects;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $items;
+
+    public function display($tpl = null)
+    {
+        $this->items = $this->get('Items');
+        ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_SUBJECTS'));
+        ToolbarHelper::addNew('subject.add', 'JTOOLBAR_NEW');
+        ToolbarHelper::editList('subject.edit', 'JTOOLBAR_EDIT');
+        ToolbarHelper::deleteList('', 'subjects.delete', 'JTOOLBAR_DELETE');
+        ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
+
+        return parent::display($tpl);
+    }
+}