Separate selected and available set questions

README.md

@@ -23,6 +23,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.10.3).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.11.0).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/language/en-GB/com_testquestions.ini

@@ -63,3 +63,6 @@ COM_TESTQUESTIONS_SUBJECT_TITLE="Nazwa przedmiotu"
 COM_TESTQUESTIONS_NEW_SUBJECT="Nowy przedmiot"
 COM_TESTQUESTIONS_EDIT_SUBJECT="Edytuj przedmiot"
 COM_TESTQUESTIONS_SELECT_SUBJECT="-- wybierz przedmiot --"
+COM_TESTQUESTIONS_FILTER_SUBJECT="Wszystkie przedmioty"
+COM_TESTQUESTIONS_SET_SELECTED_QUESTIONS="Wybrane pytania"
+COM_TESTQUESTIONS_SET_AVAILABLE_QUESTIONS="Pytania do wyboru"

administrator/components/com_testquestions/sql/updates/mysql/1.10.4.sql

@@ -0,0 +1 @@
+-- No database changes required for version 1.10.4.

administrator/components/com_testquestions/sql/updates/mysql/1.10.5.sql

@@ -0,0 +1 @@
+-- No database changes required for version 1.10.5.

administrator/components/com_testquestions/sql/updates/mysql/1.10.6.sql

@@ -0,0 +1 @@
+-- No database changes required for version 1.10.6.

administrator/components/com_testquestions/sql/updates/mysql/1.11.0.sql

@@ -0,0 +1 @@
+-- No database changes required for version 1.11.0.

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

@@ -14,6 +14,7 @@ class SetsModel extends ListModel
         parent::populateState($ordering, $direction);
         $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
         $this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
+        $this->setState('filter.subject_id', $this->getUserStateFromRequest($this->context . '.filter.subject_id', 'filter_subject_id', '', 'int'));
     }
 
     protected function getListQuery()
@@ -36,6 +37,23 @@ class SetsModel extends ListModel
             $query->where('s.published = ' . (int) $published);
         }
 
+        if ((int) $this->getState('filter.subject_id') > 0) {
+            $query->where('s.subject_id = ' . (int) $this->getState('filter.subject_id'));
+        }
+
         return $query->order('s.ordering ASC, s.title ASC');
     }
+
+    public function getSubjects()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['id', 'title'])
+                ->from($db->quoteName('#__testquestions_subjects'))
+                ->where($db->quoteName('published') . ' = 1')
+                ->order($db->quoteName('title') . ' ASC')
+        )->loadObjectList();
+    }
 }

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

@@ -14,12 +14,14 @@ class HtmlView extends BaseHtmlView
     protected $items;
     protected $pagination;
     protected $state;
+    protected $subjects;
 
     public function display($tpl = null)
     {
         $this->items = $this->get('Items');
         $this->pagination = $this->get('Pagination');
         $this->state = $this->get('State');
+        $this->subjects = $this->get('Subjects');
 
         if (count($errors = $this->get('Errors'))) {
             throw new \RuntimeException(implode("\n", $errors));

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

@@ -18,7 +18,9 @@ class HtmlView extends BaseHtmlView
         $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::apply('subject.apply', 'JTOOLBAR_APPLY');
         ToolbarHelper::save('subject.save', 'JTOOLBAR_SAVE');
+        ToolbarHelper::save2new('subject.save2new', 'JTOOLBAR_SAVE_AND_NEW');
         ToolbarHelper::cancel('subject.cancel', 'JTOOLBAR_CANCEL');
 
         return parent::display($tpl);

administrator/components/com_testquestions/tmpl/set/edit.php

@@ -13,21 +13,50 @@ HTMLHelper::_('behavior.formvalidator');
         <?php echo $this->form->renderField('subject_id'); ?>
         <?php echo $this->form->renderField('description'); ?>
         <?php echo $this->form->renderField('published'); ?>
-        <div class="mb-3">
-            <label for="set-question-category" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_CATEGORY_FILTER'); ?></label>
-            <select id="set-question-category" class="form-select">
-                <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_ALL_CATEGORIES'); ?></option>
-                <?php foreach ($this->categories as $category) : ?>
-                    <option value="<?php echo (int) $category->id; ?>"><?php echo $this->escape($category->title); ?></option>
-                <?php endforeach; ?>
-            </select>
-        </div>
         <fieldset class="mb-3">
-            <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_QUESTIONS'); ?></legend>
+            <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SELECTED_QUESTIONS'); ?></legend>
-            <div id="set-question-list" class="border rounded p-3">
+            <div id="set-selected-question-list" class="border rounded p-3">
                 <?php foreach ($this->questions as $question) : ?>
-                    <div class="form-check set-question-row" data-category="<?php echo (int) $question->category_id; ?>">
+                    <?php if (!in_array((int) $question->id, array_map('intval', (array) $this->item->question_ids), true)) continue; ?>
-                        <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; ?>" <?php echo in_array((int) $question->id, (array) $this->item->question_ids, true) ? 'checked' : ''; ?>>
+                    <div class="form-check set-question-row">
+                        <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>
+                            <?php echo $this->escape(trim(strip_tags($question->question))); ?>
+                        </label>
+                        <details class="ms-4 mt-1 mb-2">
+                            <summary><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SHOW_DETAILS'); ?></summary>
+                            <div class="mt-2 p-2 bg-light border rounded">
+                                <?php if ($question->question_type === 'open') : ?>
+                                    <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FIELD_OPEN_PATTERN'); ?>:</strong> <?php echo $this->escape($question->answer_open); ?></div>
+                                <?php else : ?>
+                                    <div><strong>A:</strong> <?php echo $question->answer_a; ?><?php echo (int) $question->correct_answer === 1 ? ' ✓' : ''; ?></div>
+                                    <div><strong>B:</strong> <?php echo $question->answer_b; ?><?php echo (int) $question->correct_answer === 2 ? ' ✓' : ''; ?></div>
+                                    <div><strong>C:</strong> <?php echo $question->answer_c; ?><?php echo (int) $question->correct_answer === 3 ? ' ✓' : ''; ?></div>
+                                    <div><strong>D:</strong> <?php echo $question->answer_d; ?><?php echo (int) $question->correct_answer === 4 ? ' ✓' : ''; ?></div>
+                                <?php endif; ?>
+                            </div>
+                        </details>
+                    </div>
+                <?php endforeach; ?>
+            </div>
+        </fieldset>
+        <fieldset class="mb-3">
+            <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_AVAILABLE_QUESTIONS'); ?></legend>
+            <div class="mb-3">
+                <label for="set-question-category" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_CATEGORY_FILTER'); ?></label>
+                <select id="set-question-category" class="form-select">
+                    <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_ALL_CATEGORIES'); ?></option>
+                    <?php foreach ($this->categories as $category) : ?>
+                        <option value="<?php echo (int) $category->id; ?>"><?php echo $this->escape($category->title); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+            <div id="set-available-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-available-question-row" data-category="<?php echo (int) $question->category_id; ?>">
+                        <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; ?>">
                         <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>
                             <?php echo $this->escape(trim(strip_tags($question->question))); ?>
@@ -56,7 +85,7 @@ HTMLHelper::_('behavior.formvalidator');
 <script>
 document.addEventListener('DOMContentLoaded', function () {
     const filter = document.getElementById('set-question-category');
-    const rows = document.querySelectorAll('.set-question-row');
+    const rows = document.querySelectorAll('.set-available-question-row');
 
     if (!filter) {
         return;

administrator/components/com_testquestions/tmpl/sets/default.php

@@ -9,16 +9,24 @@ HTMLHelper::_('behavior.multiselect');
 ?>
 <form action="<?php echo Route::_('index.php?option=com_testquestions&view=sets'); ?>" method="post" name="adminForm" id="adminForm">
     <div class="row mb-3">
-        <div class="col-md-6">
+        <div class="col-md-4">
             <input type="text" name="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="form-control" placeholder="<?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SEARCH')); ?>">
         </div>
-        <div class="col-md-3">
+        <div class="col-md-2">
             <select name="filter_published" class="form-select" onchange="this.form.submit();">
                 <option value=""><?php echo \Joomla\CMS\Language\Text::_('JOPTION_SELECT_PUBLISHED'); ?></option>
                 <option value="1" <?php echo $this->state->get('filter.published') === '1' ? 'selected' : ''; ?>><?php echo \Joomla\CMS\Language\Text::_('JPUBLISHED'); ?></option>
                 <option value="0" <?php echo $this->state->get('filter.published') === '0' ? 'selected' : ''; ?>><?php echo \Joomla\CMS\Language\Text::_('JUNPUBLISHED'); ?></option>
             </select>
         </div>
+        <div class="col-md-3">
+            <select name="filter_subject_id" class="form-select" onchange="this.form.submit();">
+                <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FILTER_SUBJECT'); ?></option>
+                <?php foreach ($this->subjects as $subject) : ?>
+                    <option value="<?php echo (int) $subject->id; ?>" <?php echo (int) $this->state->get('filter.subject_id') === (int) $subject->id ? 'selected' : ''; ?>><?php echo $this->escape($subject->title); ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
         <div class="col-md-3">
             <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button>
             <a href="<?php echo Route::_('index.php?option=com_testquestions&view=sets'); ?>" class="btn btn-secondary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_CLEAR'); ?></a>

administrator/components/com_testquestions/tmpl/subject/edit.php

@@ -1,4 +1,9 @@
-<?php defined('_JEXEC') or die; ?>
+<?php
+
+defined('_JEXEC') or die;
+
+Joomla\CMS\HTML\HTMLHelper::_('behavior.formvalidator');
+?>
 <form action="index.php?option=com_testquestions&view=subject&layout=edit&id=<?php echo (int) $this->item->id; ?>" method="post" name="adminForm" id="subject-form" class="form-validate">
     <?php echo $this->form->renderField('title'); ?>
     <?php echo $this->form->renderField('published'); ?>

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.10.3</version>
+    <version>1.11.0</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>