Compare commits

...
2 Commits
Author SHA1 Message Date
Wojtek 96e8a4a0f5 Inherit duration from parent set 2026-10-16 11:15:13 +02:00
Wojtek 3ee0b22d75 Remove apply button from set form 2026-10-16 10:35:23 +02:00
8 changed files with 28 additions and 7 deletions
+1 -1
View File
@@ -30,6 +30,6 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
## Instalacja ## Instalacja
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.37.3). 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**. Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
@@ -60,6 +60,7 @@ 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_MULTI_QUESTIONS_INFO="Pytania są dodawane w poszczególnych wariantach zestawu."
COM_TESTQUESTIONS_SET_SAVE="Zapisz" COM_TESTQUESTIONS_SET_SAVE="Zapisz"
COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE="Zapisz i zamknij" 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_DESCRIPTION="Opis zestawu"
COM_TESTQUESTIONS_SET_QUESTIONS="Pytania w zestawie" COM_TESTQUESTIONS_SET_QUESTIONS="Pytania w zestawie"
COM_TESTQUESTIONS_SET_QUESTION_COUNT="Liczba pytań" COM_TESTQUESTIONS_SET_QUESTION_COUNT="Liczba pytań"
@@ -0,0 +1 @@
-- No database changes required for version 1.38.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.39.0.
@@ -133,6 +133,10 @@ class SetModel extends AdminModel
if ($parentId > 0) { if ($parentId > 0) {
$data['set_type'] = 'variant'; $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)) { } elseif (!in_array(($data['set_type'] ?? 'ordinary'), ['ordinary', 'multi'], true)) {
$data['set_type'] = 'ordinary'; $data['set_type'] = 'ordinary';
} }
@@ -4,6 +4,7 @@ namespace Komponent\Component\Testquestions\Administrator\View\Set;
defined('_JEXEC') or die; defined('_JEXEC') or die;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text; use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Toolbar\ToolbarHelper; use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -15,6 +16,8 @@ class HtmlView extends BaseHtmlView
protected $questions; protected $questions;
protected $categories; protected $categories;
protected $variants; protected $variants;
protected $isVariant;
protected $parentTitle = '';
public function display($tpl = null) public function display($tpl = null)
{ {
@@ -23,6 +26,14 @@ class HtmlView extends BaseHtmlView
$this->questions = $this->get('Questions'); $this->questions = $this->get('Questions');
$this->categories = $this->get('Categories'); $this->categories = $this->get('Categories');
$this->variants = $this->item && (int) $this->item->id > 0 ? $this->get('Variants') : []; $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'))) { if (count($errors = $this->get('Errors'))) {
throw new \RuntimeException(implode("\n", $errors)); throw new \RuntimeException(implode("\n", $errors));
@@ -36,7 +47,6 @@ class HtmlView extends BaseHtmlView
protected function addToolbar() protected function addToolbar()
{ {
ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SET') : Text::_('COM_TESTQUESTIONS_NEW_SET')); 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::custom('set.save', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE', false);
ToolbarHelper::custom('set.saveandclose', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE', false); ToolbarHelper::custom('set.saveandclose', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE', false);
ToolbarHelper::cancel('set.cancel', 'JTOOLBAR_CANCEL'); ToolbarHelper::cancel('set.cancel', 'JTOOLBAR_CANCEL');
@@ -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"> <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"> <fieldset class="adminform">
<?php echo $this->form->renderField('parent_id'); ?> <?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"> <input type="hidden" name="jform[set_type]" value="variant">
<?php else : ?> <?php else : ?>
<?php echo $this->form->renderField('set_type'); ?> <?php echo $this->form->renderField('set_type'); ?>
<?php endif; ?> <?php endif; ?>
<?php echo $this->form->renderField('title'); ?> <?php echo $this->form->renderField('title'); ?>
<?php echo $this->form->renderField('subject_id'); ?> <?php echo $this->form->renderField('subject_id'); ?>
<?php if (!$this->isVariant) : ?>
<?php echo $this->form->renderField('duration'); ?> <?php echo $this->form->renderField('duration'); ?>
<output id="set-duration-value" class="form-text mb-3"></output> <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('test_content'); ?>
<?php echo $this->form->renderField('image'); ?> <?php echo $this->form->renderField('image'); ?>
<?php echo $this->form->renderField('description'); ?> <?php echo $this->form->renderField('description'); ?>
+1 -1
View File
@@ -4,7 +4,7 @@
<creationDate>2026-10-14</creationDate> <creationDate>2026-10-14</creationDate>
<author>Komponent</author> <author>Komponent</author>
<license>GNU General Public License version 2 or later</license> <license>GNU General Public License version 2 or later</license>
<version>1.37.3</version> <version>1.39.0</version>
<description>COM_TESTQUESTIONS_DESCRIPTION</description> <description>COM_TESTQUESTIONS_DESCRIPTION</description>
<element>com_testquestions</element> <element>com_testquestions</element>
<namespace path="src">Komponent\Component\Testquestions</namespace> <namespace path="src">Komponent\Component\Testquestions</namespace>