From 70f9a0ac4b65b831e0d70af240065dbdda7022da Mon Sep 17 00:00:00 2001
From: Wojtek <wojtek@localhost>
Date: Thu, 15 Oct 2026 17:14:58 +0200
Subject: [PATCH] Separate selected and available set questions

---
 README.md                                     |  2 +-
 .../language/en-GB/com_testquestions.ini      |  2 +
 .../sql/updates/mysql/1.11.0.sql              |  1 +
 .../com_testquestions/tmpl/set/edit.php       | 57 ++++++++++++++-----
 com_testquestions.xml                         |  2 +-
 5 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 administrator/components/com_testquestions/sql/updates/mysql/1.11.0.sql

diff --git a/README.md b/README.md
index 7433d16..fb83bc6 100644
--- a/README.md
+++ b/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.6).
+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**.
diff --git a/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini b/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini
index f09a693..ff10acd 100644
--- a/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini
+++ b/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini
@@ -64,3 +64,5 @@ 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"
diff --git a/administrator/components/com_testquestions/sql/updates/mysql/1.11.0.sql b/administrator/components/com_testquestions/sql/updates/mysql/1.11.0.sql
new file mode 100644
index 0000000..cc7011e
--- /dev/null
+++ b/administrator/components/com_testquestions/sql/updates/mysql/1.11.0.sql
@@ -0,0 +1 @@
+-- No database changes required for version 1.11.0.
diff --git a/administrator/components/com_testquestions/tmpl/set/edit.php b/administrator/components/com_testquestions/tmpl/set/edit.php
index 9bc693b..a391e02 100644
--- a/administrator/components/com_testquestions/tmpl/set/edit.php
+++ b/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>
-            <div id="set-question-list" class="border rounded p-3">
+            <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SELECTED_QUESTIONS'); ?></legend>
+            <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; ?>">
-                        <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' : ''; ?>>
+                    <?php if (!in_array((int) $question->id, array_map('intval', (array) $this->item->question_ids), true)) continue; ?>
+                    <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;
diff --git a/com_testquestions.xml b/com_testquestions.xml
index d4a1389..6c3e690 100644
--- a/com_testquestions.xml
+++ b/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.6</version>
+    <version>1.11.0</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>