Compare commits

..
14 Commits
27 changed files with 152 additions and 36 deletions
+2 -1
View File
@@ -19,10 +19,11 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
- opcjonalne zdjęcie wybierane z Media Managera,
- publikowanie, filtrowanie i usuwanie pytań w panelu administratora,
- tworzenie zestawów pytań w panelu administratora i przypisywanie do nich pytań,
- czas trwania w minutach (suwak), treść i obraz zestawu testowego,
- tabela `#__testquestions_questions` tworzona podczas instalacji.
## Instalacja
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.10.1).
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.13.2).
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
@@ -6,6 +6,9 @@
<field name="subject_id" type="sql" label="COM_TESTQUESTIONS_SUBJECT" required="true" query="SELECT id, title FROM #__testquestions_subjects WHERE published = 1 ORDER BY title ASC" key_field="id" value_field="title" translate_query="false">
<option value="0">COM_TESTQUESTIONS_SELECT_SUBJECT</option>
</field>
<field name="duration" type="range" label="COM_TESTQUESTIONS_SET_DURATION" description="COM_TESTQUESTIONS_SET_DURATION_DESC" min="0" max="120" step="1" default="0" filter="integer" />
<field name="test_content" type="editor" label="COM_TESTQUESTIONS_SET_TEST_CONTENT" buttons="true" filter="safehtml" height="150" />
<field name="image" type="media" label="COM_TESTQUESTIONS_SET_IMAGE" directory="images/testquestions" preview="tooltip" />
<field name="description" type="textarea" label="COM_TESTQUESTIONS_SET_DESCRIPTION" rows="4" filter="raw" />
<field name="published" type="list" label="JSTATUS" default="1">
<option value="1">JPUBLISHED</option>
@@ -58,8 +58,15 @@ COM_TESTQUESTIONS_SET_ALL_CATEGORIES="Wszystkie kategorie"
COM_TESTQUESTIONS_UNCATEGORIZED="Bez kategorii"
COM_TESTQUESTIONS_SET_SHOW_DETAILS="Pokaż odpowiedzi"
COM_TESTQUESTIONS_SUBJECTS="Przedmioty"
COM_TESTQUESTIONS_SET_DURATION="Czas trwania testu (minuty)"
COM_TESTQUESTIONS_SET_DURATION_DESC="Ustaw czas trwania testu w minutach za pomocą suwaka."
COM_TESTQUESTIONS_SET_TEST_CONTENT="Treść testu"
COM_TESTQUESTIONS_SET_IMAGE="Obraz testu"
COM_TESTQUESTIONS_SUBJECT="Przedmiot"
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"
@@ -42,6 +42,9 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
`id` int unsigned NOT NULL AUTO_INCREMENT,
`subject_id` int unsigned NOT NULL DEFAULT 0,
`title` varchar(255) NOT NULL,
`duration` smallint unsigned NOT NULL DEFAULT 0,
`test_content` text NULL,
`image` varchar(1024) NOT NULL DEFAULT '',
`description` text NULL,
`published` tinyint NOT NULL DEFAULT 1,
`ordering` int NOT NULL DEFAULT 0,
@@ -0,0 +1 @@
-- No database changes required for version 1.10.2.
@@ -0,0 +1 @@
-- No database changes required for version 1.10.3.
@@ -0,0 +1 @@
-- No database changes required for version 1.10.4.
@@ -0,0 +1 @@
-- No database changes required for version 1.10.5.
@@ -0,0 +1 @@
-- No database changes required for version 1.10.6.
@@ -0,0 +1 @@
-- No database changes required for version 1.11.0.
@@ -0,0 +1,4 @@
ALTER TABLE `#__testquestions_sets`
ADD COLUMN `duration` smallint unsigned NOT NULL DEFAULT 0 AFTER `title`,
ADD COLUMN `test_content` text NULL AFTER `duration`,
ADD COLUMN `image` varchar(1024) NOT NULL DEFAULT '' AFTER `test_content`;
@@ -0,0 +1 @@
-- No database changes required for version 1.12.1.
@@ -0,0 +1 @@
-- No database changes required for version 1.12.2.
@@ -0,0 +1 @@
-- No database changes required for version 1.12.3.
@@ -0,0 +1 @@
-- No database changes required for version 1.12.4.
@@ -0,0 +1,3 @@
UPDATE `#__testquestions_sets`
SET `duration` = `duration` * 60
WHERE `duration` > 0;
@@ -0,0 +1,3 @@
UPDATE `#__testquestions_sets`
SET `duration` = ROUND(`duration` / 60)
WHERE `duration` > 0;
@@ -0,0 +1 @@
-- No database changes required for version 1.13.2.
@@ -2,6 +2,9 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
`id` int unsigned NOT NULL AUTO_INCREMENT,
`subject_id` int unsigned NOT NULL DEFAULT 0,
`title` varchar(255) NOT NULL,
`duration` smallint unsigned NOT NULL DEFAULT 0,
`test_content` text NULL,
`image` varchar(1024) NOT NULL DEFAULT '',
`description` text NULL,
`published` tinyint NOT NULL DEFAULT 1,
`ordering` int NOT NULL DEFAULT 0,
@@ -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();
}
}
@@ -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));
@@ -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);
@@ -67,10 +67,10 @@ HTMLHelper::_('behavior.multiselect');
<?php if ($item->question_type === 'open') : ?>
<div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FIELD_OPEN_PATTERN'); ?>:</strong> <?php echo $item->answer_open; ?></div>
<?php else : ?>
<div><strong>A:</strong> <?php echo $item->answer_a; ?></div>
<div><strong>B:</strong> <?php echo $item->answer_b; ?></div>
<div><strong>C:</strong> <?php echo $item->answer_c; ?></div>
<div><strong>D:</strong> <?php echo $item->answer_d; ?></div>
<div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">A:</strong><span><?php echo $item->answer_a; ?></span><?php if ((int) $item->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
<div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><span><?php echo $item->answer_b; ?></span><?php if ((int) $item->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
<div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><span><?php echo $item->answer_c; ?></span><?php if ((int) $item->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
<div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><span><?php echo $item->answer_d; ?></span><?php if ((int) $item->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
<?php endif; ?>
</div>
<?php endif; ?>
@@ -10,23 +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('title'); ?>
<?php echo $this->form->renderField('subject_id'); ?>
<?php echo $this->form->renderField('duration'); ?>
<output id="set-duration-value" class="form-text mb-3"></output>
<?php echo $this->form->renderField('test_content'); ?>
<?php echo $this->form->renderField('image'); ?>
<?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))); ?>
@@ -37,10 +34,47 @@ HTMLHelper::_('behavior.formvalidator');
<?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>
<div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">A:</strong><span><?php echo $question->answer_a; ?></span><?php if ((int) $question->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
<div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><span><?php echo $question->answer_b; ?></span><?php if ((int) $question->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
<div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><span><?php echo $question->answer_c; ?></span><?php if ((int) $question->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
<div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><span><?php echo $question->answer_d; ?></span><?php if ((int) $question->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></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))); ?>
</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 class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">A:</strong><span><?php echo $question->answer_a; ?></span><?php if ((int) $question->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
<div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><span><?php echo $question->answer_b; ?></span><?php if ((int) $question->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
<div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><span><?php echo $question->answer_c; ?></span><?php if ((int) $question->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
<div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><span><?php echo $question->answer_d; ?></span><?php if ((int) $question->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
<?php endif; ?>
</div>
</details>
@@ -55,7 +89,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;
@@ -68,3 +102,20 @@ document.addEventListener('DOMContentLoaded', function () {
});
});
</script>
<script>
document.addEventListener('DOMContentLoaded', function () {
const duration = document.getElementById('jform_duration');
const output = document.getElementById('set-duration-value');
if (!duration || !output) {
return;
}
const updateDuration = function () {
output.textContent = duration.value + ' min';
};
duration.addEventListener('input', updateDuration);
updateDuration();
});
</script>
@@ -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>
@@ -1,16 +1,13 @@
<?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'); ?>
<?php echo $this->form->renderField('id'); ?>
<div class="mt-3">
<button type="submit" class="btn btn-primary" onclick="document.querySelector('#subject-form input[name=task]').value='subject.save';">
<?php echo Joomla\CMS\Language\Text::_('JTOOLBAR_SAVE'); ?>
</button>
<a class="btn btn-secondary" href="index.php?option=com_testquestions&view=subjects">
<?php echo Joomla\CMS\Language\Text::_('JTOOLBAR_CANCEL'); ?>
</a>
</div>
<input type="hidden" name="task" value="subject.save">
<input type="hidden" name="task" value="">
<?php echo Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
</form>
+1 -1
View File
@@ -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.1</version>
<version>1.13.2</version>
<description>COM_TESTQUESTIONS_DESCRIPTION</description>
<element>com_testquestions</element>
<namespace path="src">Komponent\Component\Testquestions</namespace>