Inherit duration from parent set

README.md

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

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

@@ -57,6 +57,10 @@ COM_TESTQUESTIONS_SET_VARIANTS="Warianty zestawu"
 COM_TESTQUESTIONS_SET_ADD_VARIANT="Dodaj wariant"
 COM_TESTQUESTIONS_SET_PARENT="Zestaw nadrzędny"
 COM_TESTQUESTIONS_SET_NO_VARIANTS="Brak wariantów"
+COM_TESTQUESTIONS_SET_MULTI_QUESTIONS_INFO="Pytania są dodawane w poszczególnych wariantach zestawu."
+COM_TESTQUESTIONS_SET_SAVE="Zapisz"
+COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE="Zapisz i zamknij"
+COM_TESTQUESTIONS_SET_VARIANT_DURATION_INFO="Czas testu jest pobierany z zestawu nadrzędnego."
 COM_TESTQUESTIONS_SET_DESCRIPTION="Opis zestawu"
 COM_TESTQUESTIONS_SET_QUESTIONS="Pytania w zestawie"
 COM_TESTQUESTIONS_SET_QUESTION_COUNT="Liczba pytań"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -17,8 +17,83 @@ class SetController extends FormController
         $this->setRedirect('index.php?option=com_testquestions&view=set&layout=edit&parent_id=' . $parentId);
     }
 
+    public function save2close($key = null, $urlVar = null)
+    {
+        $formData = (array) $this->input->post->get('jform', [], 'array');
+        $parentId = (int) ($formData['parent_id'] ?? 0);
+        $itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
+        $result = parent::save2close($key, $urlVar);
+
+        if ($result) {
+            if ($itemId > 0) {
+                $item = $this->getModel()->getItem($itemId);
+                $parentId = (int) ($item->parent_id ?? $parentId);
+            }
+
+            if ($parentId > 0) {
+                $this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $parentId);
+            }
+        }
+
+        return $result;
+    }
+
+    public function save($key = null, $urlVar = null)
+    {
+        $formData = (array) $this->input->post->get('jform', [], 'array');
+        $result = parent::save($key, $urlVar);
+        $itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
+
+        if ($result && $itemId > 0) {
+            $this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $itemId);
+        }
+
+        return $result;
+    }
+
+    public function saveandclose($key = null, $urlVar = null)
+    {
+        $formData = (array) $this->input->post->get('jform', [], 'array');
+        $parentId = (int) ($formData['parent_id'] ?? 0);
+        $result = parent::save($key, $urlVar);
+        $itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
+
+        if ($result && $itemId > 0 && $parentId < 1) {
+            $item = $this->getModel()->getItem($itemId);
+            $parentId = (int) ($item->parent_id ?? 0);
+        }
+
+        if ($result) {
+            $this->setRedirect(
+                $parentId > 0
+                    ? 'index.php?option=com_testquestions&task=set.edit&id=' . $parentId
+                    : 'index.php?option=com_testquestions&view=sets'
+            );
+        }
+
+        return $result;
+    }
+
     public function cancel($key = null)
     {
+        $parentId = $this->input->getInt('parent_id');
+        $formData = (array) $this->input->post->get('jform', [], 'array');
+        $parentId = (int) ($formData['parent_id'] ?? $parentId);
+
+        if ($parentId < 1) {
+            $itemId = $this->input->getInt('id');
+            if ($itemId > 0) {
+                $item = $this->getModel()->getItem($itemId);
+                $parentId = (int) ($item->parent_id ?? 0);
+            }
+        }
+
+        if ($parentId > 0) {
+            $this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $parentId);
+
+            return true;
+        }
+
         $this->setRedirect('index.php?option=com_testquestions&view=sets');
 
         return true;

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

@@ -133,10 +133,18 @@ class SetModel extends AdminModel
 
         if ($parentId > 0) {
             $data['set_type'] = 'variant';
+            $parent = $this->getItem($parentId);
+            if ($parent) {
+                $data['duration'] = (int) $parent->duration;
+            }
         } elseif (!in_array(($data['set_type'] ?? 'ordinary'), ['ordinary', 'multi'], true)) {
             $data['set_type'] = 'ordinary';
         }
 
+        if ($parentId === 0 && ($data['set_type'] ?? 'ordinary') === 'multi') {
+            $questionIds = [];
+        }
+
         if (!parent::save($data)) {
             return false;
         }

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

@@ -26,6 +26,7 @@ class SetsModel extends ListModel
             ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
             ->leftJoin($db->quoteName('#__testquestions_sets', 'p') . ' ON p.id = s.parent_id')
             ->leftJoin($db->quoteName('#__testquestions_set_questions', 'sq') . ' ON sq.set_id = s.id')
+            ->where('s.parent_id = 0')
             ->group('s.id');
 
         $search = trim((string) $this->getState('filter.search'));

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

@@ -4,6 +4,7 @@ namespace Komponent\Component\Testquestions\Administrator\View\Set;
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -15,6 +16,8 @@ class HtmlView extends BaseHtmlView
     protected $questions;
     protected $categories;
     protected $variants;
+    protected $isVariant;
+    protected $parentTitle = '';
 
     public function display($tpl = null)
     {
@@ -23,6 +26,14 @@ class HtmlView extends BaseHtmlView
         $this->questions = $this->get('Questions');
         $this->categories = $this->get('Categories');
         $this->variants = $this->item && (int) $this->item->id > 0 ? $this->get('Variants') : [];
+        $parentId = Factory::getApplication()->getInput()->getInt('parent_id');
+        $this->isVariant = (int) ($this->item->parent_id ?? 0) > 0 || $parentId > 0;
+        $this->parentTitle = (string) ($this->item->parent_title ?? '');
+
+        if ($this->isVariant && $this->parentTitle === '' && $parentId > 0) {
+            $parent = $this->getModel()->getItem($parentId);
+            $this->parentTitle = (string) ($parent->title ?? '');
+        }
 
         if (count($errors = $this->get('Errors'))) {
             throw new \RuntimeException(implode("\n", $errors));
@@ -36,8 +47,8 @@ class HtmlView extends BaseHtmlView
     protected function addToolbar()
     {
         ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SET') : Text::_('COM_TESTQUESTIONS_NEW_SET'));
-        ToolbarHelper::apply('set.apply', 'JTOOLBAR_APPLY');
+        ToolbarHelper::custom('set.save', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE', false);
-        ToolbarHelper::save('set.save', 'JTOOLBAR_SAVE');
+        ToolbarHelper::custom('set.saveandclose', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE', false);
         ToolbarHelper::cancel('set.cancel', 'JTOOLBAR_CANCEL');
     }
 }

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

@@ -10,16 +10,20 @@ HTMLHelper::_('behavior.formvalidator');
 <form action="<?php echo Route::_('index.php?option=com_testquestions&view=set&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate">
     <fieldset class="adminform">
         <?php echo $this->form->renderField('parent_id'); ?>
-        <?php if ((int) $this->item->parent_id > 0) : ?>
+        <?php if ($this->isVariant) : ?>
-            <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_PARENT'); ?>: <?php echo $this->escape($this->item->parent_title ?? ''); ?></div>
+            <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_PARENT'); ?>: <?php echo $this->escape($this->parentTitle); ?></div>
             <input type="hidden" name="jform[set_type]" value="variant">
         <?php else : ?>
             <?php echo $this->form->renderField('set_type'); ?>
         <?php endif; ?>
         <?php echo $this->form->renderField('title'); ?>
         <?php echo $this->form->renderField('subject_id'); ?>
+        <?php if (!$this->isVariant) : ?>
             <?php echo $this->form->renderField('duration'); ?>
             <output id="set-duration-value" class="form-text mb-3"></output>
+        <?php else : ?>
+            <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANT_DURATION_INFO'); ?></div>
+        <?php endif; ?>
         <?php echo $this->form->renderField('test_content'); ?>
         <?php echo $this->form->renderField('image'); ?>
         <?php echo $this->form->renderField('description'); ?>
@@ -44,6 +48,7 @@ HTMLHelper::_('behavior.formvalidator');
                 </a>
             </fieldset>
         <?php endif; ?>
+        <?php if (!((string) $this->item->set_type === 'multi' && (int) $this->item->parent_id === 0)) : ?>
         <fieldset class="mb-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">
@@ -109,6 +114,11 @@ HTMLHelper::_('behavior.formvalidator');
                 <?php endforeach; ?>
             </div>
         </fieldset>
+        <?php else : ?>
+            <div class="alert alert-info">
+                <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_MULTI_QUESTIONS_INFO'); ?>
+            </div>
+        <?php endif; ?>
     </fieldset>
     <input type="hidden" name="task" value="">
     <?php echo HTMLHelper::_('form.token'); ?>

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