Compare commits

..
2 Commits
Author SHA1 Message Date
Wojtek b774f0d94d Sync variant publication with parent set 2026-10-16 19:55:00 +02:00
Wojtek a788c8c00e Add action to unpublish all test sets 2026-10-16 19:52:09 +02:00
10 changed files with 80 additions and 3 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.43.11). W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.13).
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**. Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
@@ -46,6 +46,9 @@ COM_TESTQUESTIONS_ERROR_OPEN_PATTERN="Dla pytania otwartego wpisz wzorzec popraw
COM_TESTQUESTIONS_ERROR_ALL_ANSWERS="Dla pytania zamkniętego uzupełnij wszystkie cztery odpowiedzi." COM_TESTQUESTIONS_ERROR_ALL_ANSWERS="Dla pytania zamkniętego uzupełnij wszystkie cztery odpowiedzi."
COM_TESTQUESTIONS_ERROR_META="Wybierz poprawny czas i liczbę punktów." COM_TESTQUESTIONS_ERROR_META="Wybierz poprawny czas i liczbę punktów."
COM_TESTQUESTIONS_SETS="Zestawy pytań" COM_TESTQUESTIONS_SETS="Zestawy pytań"
COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL="Wyłącz wszystkie zestawy"
COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL_CONFIRM="Czy na pewno wyłączyć wszystkie zestawy testów, w tym wszystkie warianty?"
COM_TESTQUESTIONS_SETS_UNPUBLISHED_ALL="Wyłączono %s zestawów."
COM_TESTQUESTIONS_NEW_SET="Nowy zestaw pytań" COM_TESTQUESTIONS_NEW_SET="Nowy zestaw pytań"
COM_TESTQUESTIONS_EDIT_SET="Edytuj zestaw pytań" COM_TESTQUESTIONS_EDIT_SET="Edytuj zestaw pytań"
COM_TESTQUESTIONS_SET_TITLE="Nazwa zestawu" COM_TESTQUESTIONS_SET_TITLE="Nazwa zestawu"
@@ -62,6 +65,7 @@ COM_TESTQUESTIONS_SET_REORDER_INFO="Przeciągnij pytania, aby zmienić ich kolej
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_VARIANT_DURATION_INFO="Czas testu jest pobierany z zestawu nadrzędnego."
COM_TESTQUESTIONS_SET_VARIANT_STATUS_INHERITED="Status publikacji wariantu jest taki sam jak status zestawu nadrzędnego i zmienia się razem z nim."
COM_TESTQUESTIONS_AI_SETTINGS="Ustawienia AI" COM_TESTQUESTIONS_AI_SETTINGS="Ustawienia AI"
COM_TESTQUESTIONS_AI_PROVIDER="Dostawca AI" COM_TESTQUESTIONS_AI_PROVIDER="Dostawca AI"
COM_TESTQUESTIONS_AI_API_KEY="Klucz API" COM_TESTQUESTIONS_AI_API_KEY="Klucz API"
@@ -0,0 +1 @@
-- No database changes required for version 1.43.12.
@@ -0,0 +1 @@
-- No database changes required for version 1.43.13.
@@ -5,11 +5,40 @@ namespace Komponent\Component\Testquestions\Administrator\Controller;
defined('_JEXEC') or die; defined('_JEXEC') or die;
use Joomla\CMS\MVC\Controller\AdminController; use Joomla\CMS\MVC\Controller\AdminController;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Router\Route;
use Joomla\CMS\Session\Session;
class SetsController extends AdminController class SetsController extends AdminController
{ {
protected $text_prefix = 'COM_TESTQUESTIONS'; protected $text_prefix = 'COM_TESTQUESTIONS';
public function unpublishall(): void
{
if (!Session::checkToken()) {
throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
}
$user = Factory::getApplication()->getIdentity();
if (!$user->authorise('core.edit.state', 'com_testquestions') && !$user->authorise('core.edit', 'com_testquestions')) {
throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
}
$db = Factory::getContainer()->get('DatabaseDriver');
$db->setQuery(
$db->getQuery(true)
->update($db->quoteName('#__testquestions_sets'))
->set($db->quoteName('published') . ' = 0')
->where($db->quoteName('published') . ' = 1')
)->execute();
$this->setRedirect(
Route::_('index.php?option=com_testquestions&view=sets', false),
Text::sprintf('COM_TESTQUESTIONS_SETS_UNPUBLISHED_ALL', $db->getAffectedRows())
);
}
public function getModel($name = 'Set', $prefix = 'Administrator', $config = ['ignore_request' => true]) public function getModel($name = 'Set', $prefix = 'Administrator', $config = ['ignore_request' => true])
{ {
return parent::getModel($name, $prefix, $config); return parent::getModel($name, $prefix, $config);
@@ -9,6 +9,26 @@ use Joomla\CMS\MVC\Model\AdminModel;
class SetModel extends AdminModel class SetModel extends AdminModel
{ {
public function publish(&$pks, $value = 1)
{
$ids = array_values(array_unique(array_filter(array_map('intval', (array) $pks))));
if (!parent::publish($pks, $value)) {
return false;
}
if ($ids) {
$db = Factory::getContainer()->get('DatabaseDriver');
$db->setQuery(
$db->getQuery(true)
->update($db->quoteName('#__testquestions_sets'))
->set($db->quoteName('published') . ' = ' . (int) $value)
->where($db->quoteName('parent_id') . ' IN (' . implode(',', $ids) . ')')
)->execute();
}
return true;
}
public function getTable($name = 'Set', $prefix = 'Administrator', $config = []) public function getTable($name = 'Set', $prefix = 'Administrator', $config = [])
{ {
return $this->getMVCFactory()->createTable($name, $prefix, $config); return $this->getMVCFactory()->createTable($name, $prefix, $config);
@@ -136,6 +156,7 @@ class SetModel extends AdminModel
$parent = $this->getItem($parentId); $parent = $this->getItem($parentId);
if ($parent) { if ($parent) {
$data['duration'] = (int) $parent->duration; $data['duration'] = (int) $parent->duration;
$data['published'] = (int) $parent->published;
} }
} 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';
@@ -151,6 +172,15 @@ class SetModel extends AdminModel
$setId = (int) $this->getState($this->getName() . '.id'); $setId = (int) $this->getState($this->getName() . '.id');
$db = Factory::getContainer()->get('DatabaseDriver'); $db = Factory::getContainer()->get('DatabaseDriver');
if ($parentId === 0) {
$db->setQuery(
$db->getQuery(true)
->update($db->quoteName('#__testquestions_sets'))
->set($db->quoteName('published') . ' = ' . (int) ($data['published'] ?? 1))
->where($db->quoteName('parent_id') . ' = ' . $setId)
)->execute();
}
$db->setQuery( $db->setQuery(
$db->getQuery(true) $db->getQuery(true)
->delete($db->quoteName('#__testquestions_set_questions')) ->delete($db->quoteName('#__testquestions_set_questions'))
@@ -15,6 +15,7 @@ class HtmlView extends BaseHtmlView
protected $pagination; protected $pagination;
protected $state; protected $state;
protected $subjects; protected $subjects;
protected $canUnpublishAll = false;
public function display($tpl = null) public function display($tpl = null)
{ {
@@ -22,6 +23,8 @@ class HtmlView extends BaseHtmlView
$this->pagination = $this->get('Pagination'); $this->pagination = $this->get('Pagination');
$this->state = $this->get('State'); $this->state = $this->get('State');
$this->subjects = $this->get('Subjects'); $this->subjects = $this->get('Subjects');
$user = $this->getCurrentUser();
$this->canUnpublishAll = $user->authorise('core.edit.state', 'com_testquestions') || $user->authorise('core.edit', 'com_testquestions');
if (count($errors = $this->get('Errors'))) { if (count($errors = $this->get('Errors'))) {
throw new \RuntimeException(implode("\n", $errors)); throw new \RuntimeException(implode("\n", $errors));
@@ -28,7 +28,11 @@ HTMLHelper::_('behavior.formvalidator');
<?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'); ?>
<?php echo $this->form->renderField('published'); ?> <?php if ($this->isVariant) : ?>
<div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANT_STATUS_INHERITED'); ?></div>
<?php else : ?>
<?php echo $this->form->renderField('published'); ?>
<?php endif; ?>
<?php if ((int) $this->item->id > 0 && (string) $this->item->set_type === 'multi') : ?> <?php if ((int) $this->item->id > 0 && (string) $this->item->set_type === 'multi') : ?>
<fieldset class="mb-3"> <fieldset class="mb-3">
<legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANTS'); ?></legend> <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANTS'); ?></legend>
@@ -30,6 +30,11 @@ HTMLHelper::_('behavior.multiselect');
<div class="col-md-3"> <div class="col-md-3">
<button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button> <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> <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>
<?php if ($this->canUnpublishAll) : ?>
<button type="submit" class="btn btn-warning" data-confirm="<?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL_CONFIRM')); ?>" onclick="if (!confirm(this.dataset.confirm)) { return false; } this.form.task.value='sets.unpublishall';">
<?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL'); ?>
</button>
<?php endif; ?>
</div> </div>
</div> </div>
+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.43.11</version> <version>1.43.13</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>