Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
06d6cc2027 | ||
|
|
e52d31a783 | ||
|
|
ceb6a6c6ef | ||
|
|
3eabeebf6b | ||
|
|
83e70dd02f | ||
|
|
c9b39f795a | ||
|
|
84aa7e637b |
@@ -13,6 +13,9 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
|
|||||||
- frontendowy widok pytań filtrowany po symbolu arkusza egzaminacyjnego,
|
- frontendowy widok pytań filtrowany po symbolu arkusza egzaminacyjnego,
|
||||||
- frontendowy widok testu na podstawie wybranego zestawu pytań,
|
- frontendowy widok testu na podstawie wybranego zestawu pytań,
|
||||||
- dwuetapowe rozpoczęcie testu z loginem użytkownika i możliwością przedłużenia czasu,
|
- dwuetapowe rozpoczęcie testu z loginem użytkownika i możliwością przedłużenia czasu,
|
||||||
|
- zegar odliczający czas testu i automatyczne zakończenie po jego upływie,
|
||||||
|
- zapisywanie wyników testów i zaznaczonych odpowiedzi w bazie danych,
|
||||||
|
- podgląd zapisanych testów w panelu administratora,
|
||||||
- pozycję menu „Arkusz egzaminacyjny” z opcjonalnym symbolem arkusza,
|
- pozycję menu „Arkusz egzaminacyjny” z opcjonalnym symbolem arkusza,
|
||||||
- listę wyboru dostępnych symboli arkuszy na stronie klienckiej,
|
- listę wyboru dostępnych symboli arkuszy na stronie klienckiej,
|
||||||
- możliwość rozwiązania arkusza i wyświetlenia wyniku oraz odpowiedzi poprawnych i zaznaczonych,
|
- możliwość rozwiązania arkusza i wyświetlenia wyniku oraz odpowiedzi poprawnych i zaznaczonych,
|
||||||
@@ -26,6 +29,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.15.2).
|
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.18.1).
|
||||||
|
|
||||||
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
|
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
|
||||||
|
|||||||
@@ -62,6 +62,19 @@ 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_DURATION_DESC="Ustaw czas trwania testu w minutach za pomocą suwaka."
|
||||||
COM_TESTQUESTIONS_SET_TEST_CONTENT="Treść testu"
|
COM_TESTQUESTIONS_SET_TEST_CONTENT="Treść testu"
|
||||||
COM_TESTQUESTIONS_SET_IMAGE="Obraz testu"
|
COM_TESTQUESTIONS_SET_IMAGE="Obraz testu"
|
||||||
|
COM_TESTQUESTIONS_RESULTS="Zapisane testy"
|
||||||
|
COM_TESTQUESTIONS_RESULT_PREVIEW="Podgląd zapisanego testu"
|
||||||
|
COM_TESTQUESTIONS_RESULT_NOT_FOUND="Nie znaleziono zapisanego testu."
|
||||||
|
COM_TESTQUESTIONS_RESULT_PARTICIPANT="Użytkownik"
|
||||||
|
COM_TESTQUESTIONS_RESULT_SCORE="Wynik"
|
||||||
|
COM_TESTQUESTIONS_RESULT_DATE="Data zakończenia"
|
||||||
|
COM_TESTQUESTIONS_RESULT_ANSWERS="Odpowiedzi"
|
||||||
|
COM_TESTQUESTIONS_RESULTS_SEARCH="Szukaj po użytkowniku lub zestawie..."
|
||||||
|
COM_TESTQUESTIONS_YOUR_ANSWER="Twoja odpowiedź"
|
||||||
|
COM_TESTQUESTIONS_SELECTED_ANSWER="Zaznaczona odpowiedź"
|
||||||
|
COM_TESTQUESTIONS_ANSWER_CORRECT="Poprawna odpowiedź"
|
||||||
|
COM_TESTQUESTIONS_ANSWER_INCORRECT="Niepoprawna odpowiedź"
|
||||||
|
COM_TESTQUESTIONS_CORRECT_PATTERN="Wzorzec poprawnej odpowiedzi"
|
||||||
COM_TESTQUESTIONS_SUBJECT="Przedmiot"
|
COM_TESTQUESTIONS_SUBJECT="Przedmiot"
|
||||||
COM_TESTQUESTIONS_SUBJECT_TITLE="Nazwa przedmiotu"
|
COM_TESTQUESTIONS_SUBJECT_TITLE="Nazwa przedmiotu"
|
||||||
COM_TESTQUESTIONS_NEW_SUBJECT="Nowy przedmiot"
|
COM_TESTQUESTIONS_NEW_SUBJECT="Nowy przedmiot"
|
||||||
|
|||||||
@@ -73,3 +73,19 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_set_questions` (
|
|||||||
PRIMARY KEY (`set_id`, `question_id`),
|
PRIMARY KEY (`set_id`, `question_id`),
|
||||||
KEY `idx_question_id` (`question_id`)
|
KEY `idx_question_id` (`question_id`)
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `#__testquestions_results` (
|
||||||
|
`id` int unsigned NOT NULL AUTO_INCREMENT,
|
||||||
|
`set_id` int unsigned NOT NULL,
|
||||||
|
`participant_name` varchar(255) NOT NULL DEFAULT '',
|
||||||
|
`extra_time` smallint unsigned NOT NULL DEFAULT 0,
|
||||||
|
`correct_count` smallint unsigned NOT NULL DEFAULT 0,
|
||||||
|
`total_count` smallint unsigned NOT NULL DEFAULT 0,
|
||||||
|
`percentage` decimal(5,2) NOT NULL DEFAULT 0.00,
|
||||||
|
`answers` longtext NULL,
|
||||||
|
`created` datetime NOT NULL,
|
||||||
|
`created_by` int unsigned NOT NULL DEFAULT 0,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
KEY `idx_set_id` (`set_id`),
|
||||||
|
KEY `idx_created` (`created`)
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
DROP TABLE IF EXISTS `#__testquestions_set_questions`;
|
DROP TABLE IF EXISTS `#__testquestions_set_questions`;
|
||||||
DROP TABLE IF EXISTS `#__testquestions_sets`;
|
DROP TABLE IF EXISTS `#__testquestions_sets`;
|
||||||
DROP TABLE IF EXISTS `#__testquestions_subjects`;
|
DROP TABLE IF EXISTS `#__testquestions_subjects`;
|
||||||
|
DROP TABLE IF EXISTS `#__testquestions_results`;
|
||||||
DROP TABLE IF EXISTS `#__testquestions_questions`;
|
DROP TABLE IF EXISTS `#__testquestions_questions`;
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.16.0.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.16.1.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.16.2.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.16.3.
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
CREATE TABLE IF NOT EXISTS `#__testquestions_results` (
|
||||||
|
`id` int unsigned NOT NULL AUTO_INCREMENT,
|
||||||
|
`set_id` int unsigned NOT NULL,
|
||||||
|
`participant_name` varchar(255) NOT NULL DEFAULT '',
|
||||||
|
`extra_time` smallint unsigned NOT NULL DEFAULT 0,
|
||||||
|
`correct_count` smallint unsigned NOT NULL DEFAULT 0,
|
||||||
|
`total_count` smallint unsigned NOT NULL DEFAULT 0,
|
||||||
|
`percentage` decimal(5,2) NOT NULL DEFAULT 0.00,
|
||||||
|
`answers` longtext NULL,
|
||||||
|
`created` datetime NOT NULL,
|
||||||
|
`created_by` int unsigned NOT NULL DEFAULT 0,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
KEY `idx_set_id` (`set_id`),
|
||||||
|
KEY `idx_created` (`created`)
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.18.0.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.18.1.
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Komponent\Component\Testquestions\Administrator\Model;
|
||||||
|
|
||||||
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
|
use Joomla\CMS\Factory;
|
||||||
|
use Joomla\CMS\MVC\Model\BaseDatabaseModel;
|
||||||
|
|
||||||
|
class ResultModel extends BaseDatabaseModel
|
||||||
|
{
|
||||||
|
public function getItem($pk = null)
|
||||||
|
{
|
||||||
|
$id = (int) ($pk ?: Factory::getApplication()->getInput()->getInt('id'));
|
||||||
|
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||||
|
$item = $db->setQuery(
|
||||||
|
$db->getQuery(true)
|
||||||
|
->select(['r.*', 's.title AS set_title', 'sub.title AS subject_title'])
|
||||||
|
->from($db->quoteName('#__testquestions_results', 'r'))
|
||||||
|
->leftJoin($db->quoteName('#__testquestions_sets', 's') . ' ON s.id = r.set_id')
|
||||||
|
->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
|
||||||
|
->where('r.id = ' . $id)
|
||||||
|
)->loadObject();
|
||||||
|
|
||||||
|
if (!$item) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$item->answers = json_decode((string) $item->answers, true) ?: [];
|
||||||
|
$ids = array_map('intval', array_keys($item->answers));
|
||||||
|
$item->questions = [];
|
||||||
|
|
||||||
|
if ($ids) {
|
||||||
|
$item->questions = $db->setQuery(
|
||||||
|
$db->getQuery(true)
|
||||||
|
->select(['id', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer'])
|
||||||
|
->from($db->quoteName('#__testquestions_questions'))
|
||||||
|
->where('id IN (' . implode(',', $ids) . ')')
|
||||||
|
)->loadObjectList('id');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $item;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Komponent\Component\Testquestions\Administrator\Model;
|
||||||
|
|
||||||
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
|
use Joomla\CMS\Factory;
|
||||||
|
use Joomla\CMS\MVC\Model\ListModel;
|
||||||
|
|
||||||
|
class ResultsModel extends ListModel
|
||||||
|
{
|
||||||
|
protected function populateState($ordering = 'r.created', $direction = 'desc')
|
||||||
|
{
|
||||||
|
parent::populateState($ordering, $direction);
|
||||||
|
$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getListQuery()
|
||||||
|
{
|
||||||
|
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||||
|
$query = $db->getQuery(true)
|
||||||
|
->select(['r.*', 's.title AS set_title', 'sub.title AS subject_title'])
|
||||||
|
->from($db->quoteName('#__testquestions_results', 'r'))
|
||||||
|
->leftJoin($db->quoteName('#__testquestions_sets', 's') . ' ON s.id = r.set_id')
|
||||||
|
->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id');
|
||||||
|
|
||||||
|
$search = trim((string) $this->getState('filter.search'));
|
||||||
|
if ($search !== '') {
|
||||||
|
$needle = $db->quote('%' . $db->escape($search, true) . '%', false);
|
||||||
|
$query->where('(r.participant_name LIKE ' . $needle . ' OR s.title LIKE ' . $needle . ')');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $query->order('r.created DESC, r.id DESC');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -57,5 +57,11 @@ class HtmlView extends BaseHtmlView
|
|||||||
'COM_TESTQUESTIONS_SETS',
|
'COM_TESTQUESTIONS_SETS',
|
||||||
'list'
|
'list'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
ToolbarHelper::link(
|
||||||
|
'index.php?option=com_testquestions&view=results',
|
||||||
|
'COM_TESTQUESTIONS_RESULTS',
|
||||||
|
'list'
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Komponent\Component\Testquestions\Administrator\View\Result;
|
||||||
|
|
||||||
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
|
use Joomla\CMS\Language\Text;
|
||||||
|
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
|
||||||
|
use Joomla\CMS\Toolbar\ToolbarHelper;
|
||||||
|
|
||||||
|
class HtmlView extends BaseHtmlView
|
||||||
|
{
|
||||||
|
protected $item;
|
||||||
|
|
||||||
|
public function display($tpl = null)
|
||||||
|
{
|
||||||
|
$this->item = $this->get('Item');
|
||||||
|
|
||||||
|
if (!$this->item) {
|
||||||
|
throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_RESULT_NOT_FOUND'));
|
||||||
|
}
|
||||||
|
|
||||||
|
ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULT_PREVIEW'));
|
||||||
|
ToolbarHelper::link('index.php?option=com_testquestions&view=results', 'COM_TESTQUESTIONS_RESULTS', 'back');
|
||||||
|
|
||||||
|
return parent::display($tpl);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Komponent\Component\Testquestions\Administrator\View\Results;
|
||||||
|
|
||||||
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
|
use Joomla\CMS\HTML\HTMLHelper;
|
||||||
|
use Joomla\CMS\Language\Text;
|
||||||
|
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
|
||||||
|
use Joomla\CMS\Toolbar\ToolbarHelper;
|
||||||
|
|
||||||
|
class HtmlView extends BaseHtmlView
|
||||||
|
{
|
||||||
|
protected $items;
|
||||||
|
protected $pagination;
|
||||||
|
protected $state;
|
||||||
|
|
||||||
|
public function display($tpl = null)
|
||||||
|
{
|
||||||
|
$this->items = $this->get('Items');
|
||||||
|
$this->pagination = $this->get('Pagination');
|
||||||
|
$this->state = $this->get('State');
|
||||||
|
ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULTS'));
|
||||||
|
ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
|
||||||
|
|
||||||
|
return parent::display($tpl);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -57,5 +57,10 @@ class HtmlView extends BaseHtmlView
|
|||||||
'COM_TESTQUESTIONS_SUBJECTS',
|
'COM_TESTQUESTIONS_SUBJECTS',
|
||||||
'list'
|
'list'
|
||||||
);
|
);
|
||||||
|
ToolbarHelper::link(
|
||||||
|
'index.php?option=com_testquestions&view=results',
|
||||||
|
'COM_TESTQUESTIONS_RESULTS',
|
||||||
|
'list'
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?php defined('_JEXEC') or die; ?>
|
||||||
|
<div class="container-fluid">
|
||||||
|
<dl class="row">
|
||||||
|
<dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_PARTICIPANT'); ?></dt>
|
||||||
|
<dd class="col-sm-9"><?php echo $this->escape($this->item->participant_name); ?></dd>
|
||||||
|
<dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></dt>
|
||||||
|
<dd class="col-sm-9"><?php echo $this->escape(($this->item->subject_title ? $this->item->subject_title . ' — ' : '') . $this->item->set_title); ?></dd>
|
||||||
|
<dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_SCORE'); ?></dt>
|
||||||
|
<dd class="col-sm-9"><?php echo (int) $this->item->correct_count; ?> / <?php echo (int) $this->item->total_count; ?> (<?php echo htmlspecialchars((string) $this->item->percentage, ENT_QUOTES, 'UTF-8'); ?>%)</dd>
|
||||||
|
</dl>
|
||||||
|
<h2><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_ANSWERS'); ?></h2>
|
||||||
|
<?php foreach ($this->item->answers as $questionId => $answer) : ?>
|
||||||
|
<?php $question = $this->item->questions[(int) $questionId] ?? null; if (!$question) continue; ?>
|
||||||
|
<article class="mb-4 border rounded p-3">
|
||||||
|
<div class="mb-2"><?php echo $question->question; ?></div>
|
||||||
|
<?php if ($question->question_type === 'open') : ?>
|
||||||
|
<div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_YOUR_ANSWER'); ?>:</strong> <?php echo htmlspecialchars($answer['selected'] ?: '—', ENT_QUOTES, 'UTF-8'); ?></div>
|
||||||
|
<div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_PATTERN'); ?>:</strong> <?php echo htmlspecialchars($question->answer_open, ENT_QUOTES, 'UTF-8'); ?></div>
|
||||||
|
<?php else : ?>
|
||||||
|
<div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECTED_ANSWER'); ?>:</strong> <?php echo $answer['selected'] ? chr(64 + (int) $answer['selected']) : '—'; ?></div>
|
||||||
|
<div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_ANSWER'); ?>:</strong> <?php echo chr(64 + (int) $question->correct_answer); ?></div>
|
||||||
|
<?php endif; ?>
|
||||||
|
<div class="mt-2 <?php echo !empty($answer['correct']) ? 'text-success' : 'text-danger'; ?>"><?php echo !empty($answer['correct']) ? '✓ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_CORRECT') : '✗ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_INCORRECT'); ?></div>
|
||||||
|
</article>
|
||||||
|
<?php endforeach; ?>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
|
use Joomla\CMS\HTML\HTMLHelper;
|
||||||
|
use Joomla\CMS\Router\Route;
|
||||||
|
?>
|
||||||
|
<form action="<?php echo Route::_('index.php?option=com_testquestions&view=results'); ?>" method="post" name="adminForm" id="adminForm">
|
||||||
|
<div class="row mb-3">
|
||||||
|
<div class="col-md-6">
|
||||||
|
<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_RESULTS_SEARCH')); ?>">
|
||||||
|
</div>
|
||||||
|
<div class="col-md-3"><button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button></div>
|
||||||
|
</div>
|
||||||
|
<table class="table table-striped">
|
||||||
|
<thead><tr>
|
||||||
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_PARTICIPANT'); ?></th>
|
||||||
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></th>
|
||||||
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_SCORE'); ?></th>
|
||||||
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_DATE'); ?></th>
|
||||||
|
</tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<?php foreach ($this->items as $item) : ?>
|
||||||
|
<tr class="<?php echo (int) $item->extra_time > 0 ? 'table-warning' : ''; ?>">
|
||||||
|
<th><a href="<?php echo Route::_('index.php?option=com_testquestions&view=result&id=' . (int) $item->id); ?>"><?php echo $this->escape($item->participant_name); ?></a></th>
|
||||||
|
<td><?php echo $this->escape(($item->subject_title ? $item->subject_title . ' — ' : '') . $item->set_title); ?></td>
|
||||||
|
<td><?php echo (int) $item->correct_count; ?> / <?php echo (int) $item->total_count; ?> (<?php echo htmlspecialchars((string) $item->percentage, ENT_QUOTES, 'UTF-8'); ?>%)</td>
|
||||||
|
<td><?php echo HTMLHelper::_('date', $item->created, 'Y-m-d H:i'); ?></td>
|
||||||
|
</tr>
|
||||||
|
<?php endforeach; ?>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<?php echo $this->pagination->getListFooter(); ?>
|
||||||
|
<input type="hidden" name="task" value="">
|
||||||
|
<?php echo HTMLHelper::_('form.token'); ?>
|
||||||
|
</form>
|
||||||
@@ -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.15.2</version>
|
<version>1.18.1</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>
|
||||||
|
|||||||
@@ -26,3 +26,4 @@ COM_TESTQUESTIONS_PARTICIPANT_NAME="Login lub nazwa użytkownika"
|
|||||||
COM_TESTQUESTIONS_EXTRA_TIME="Przedłużenie czasu"
|
COM_TESTQUESTIONS_EXTRA_TIME="Przedłużenie czasu"
|
||||||
COM_TESTQUESTIONS_START_TEST="Rozpocznij test"
|
COM_TESTQUESTIONS_START_TEST="Rozpocznij test"
|
||||||
COM_TESTQUESTIONS_SET_START_HINT="Wybierz zestaw, wpisz login lub nazwę użytkownika i zatwierdź rozpoczęcie testu."
|
COM_TESTQUESTIONS_SET_START_HINT="Wybierz zestaw, wpisz login lub nazwę użytkownika i zatwierdź rozpoczęcie testu."
|
||||||
|
COM_TESTQUESTIONS_TIMER_REMAINING="Pozostały czas"
|
||||||
|
|||||||
@@ -18,6 +18,18 @@
|
|||||||
margin: auto;
|
margin: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.com-testquestions #test-timer-container {
|
||||||
|
position: fixed;
|
||||||
|
left: 2rem;
|
||||||
|
bottom: 2rem;
|
||||||
|
z-index: 1050;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
background: transparent;
|
||||||
|
border: 0;
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
.com-testquestions .timer-text {
|
.com-testquestions .timer-text {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
|
|||||||
@@ -70,4 +70,29 @@ class SetModel extends BaseDatabaseModel
|
|||||||
->order('sub.title ASC, s.title ASC')
|
->order('sub.title ASC, s.title ASC')
|
||||||
)->loadObjectList();
|
)->loadObjectList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function saveResult(string $participantName, int $extraTime, array $result): bool
|
||||||
|
{
|
||||||
|
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||||
|
$setId = $this->getSetId();
|
||||||
|
$user = Factory::getApplication()->getIdentity();
|
||||||
|
|
||||||
|
if ($setId < 1 || trim($participantName) === '') {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$row = (object) [
|
||||||
|
'set_id' => $setId,
|
||||||
|
'participant_name' => trim($participantName),
|
||||||
|
'extra_time' => max(0, $extraTime),
|
||||||
|
'correct_count' => (int) ($result['correct'] ?? 0),
|
||||||
|
'total_count' => (int) ($result['total'] ?? 0),
|
||||||
|
'percentage' => (float) ($result['percentage'] ?? 0),
|
||||||
|
'answers' => json_encode($result['items'] ?? [], JSON_UNESCAPED_UNICODE),
|
||||||
|
'created' => Factory::getDate()->toSql(),
|
||||||
|
'created_by' => $user ? (int) $user->id : 0,
|
||||||
|
];
|
||||||
|
|
||||||
|
return (bool) $db->insertObject('#__testquestions_results', $row);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,14 @@ class HtmlView extends BaseHtmlView
|
|||||||
&& $input->post->getInt('set_id', 0) > 0;
|
&& $input->post->getInt('set_id', 0) > 0;
|
||||||
$this->results = $this->buildResults($this->items);
|
$this->results = $this->buildResults($this->items);
|
||||||
|
|
||||||
|
if ($this->results) {
|
||||||
|
$this->getModel()->saveResult(
|
||||||
|
$input->post->getString('participant_name', ''),
|
||||||
|
$input->post->getInt('extra_time', 0),
|
||||||
|
$this->results
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return parent::display($tpl);
|
return parent::display($tpl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -46,11 +46,20 @@ use Joomla\CMS\Factory;
|
|||||||
<?php if ($this->set->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($this->set->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
|
<?php if ($this->set->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($this->set->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
|
||||||
<?php if ($this->set->test_content) : ?><div class="test-set-content"><?php echo $this->set->test_content; ?></div><?php endif; ?>
|
<?php if ($this->set->test_content) : ?><div class="test-set-content"><?php echo $this->set->test_content; ?></div><?php endif; ?>
|
||||||
</header>
|
</header>
|
||||||
|
<?php if (!$this->results && ((int) $this->set->duration + $extraTime) > 0) : ?>
|
||||||
|
<div class="timer-container mb-4" id="test-timer-container" data-duration="<?php echo ((int) $this->set->duration + $extraTime) * 60; ?>" aria-live="polite">
|
||||||
|
<svg width="120" height="120" viewBox="0 0 120 120" aria-hidden="true">
|
||||||
|
<circle cx="60" cy="60" r="54" fill="none" stroke="#dfe3e7" stroke-width="8"></circle>
|
||||||
|
<circle id="test-timer-ring" class="progress-ring__circle" cx="60" cy="60" r="54" fill="none" stroke="#4a86cf" stroke-width="8" stroke-linecap="round"></circle>
|
||||||
|
</svg>
|
||||||
|
<div id="test-timer-text" class="timer-text">--:--</div>
|
||||||
|
</div>
|
||||||
|
<?php endif; ?>
|
||||||
<?php if ($this->results) : ?>
|
<?php if ($this->results) : ?>
|
||||||
<div class="alert alert-success test-result"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT'); ?>:</strong> <?php echo (int) $this->results['correct']; ?> / <?php echo (int) $this->results['total']; ?> (<?php echo htmlspecialchars((string) $this->results['percentage'], ENT_QUOTES, 'UTF-8'); ?>%)</div>
|
<div class="alert alert-success test-result"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT'); ?>:</strong> <?php echo (int) $this->results['correct']; ?> / <?php echo (int) $this->results['total']; ?> (<?php echo htmlspecialchars((string) $this->results['percentage'], ENT_QUOTES, 'UTF-8'); ?>%)</div>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<?php if ($this->items) : ?>
|
<?php if ($this->items) : ?>
|
||||||
<form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="post">
|
<form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="post" id="test-form">
|
||||||
<?php foreach ($this->items as $number => $item) : ?>
|
<?php foreach ($this->items as $number => $item) : ?>
|
||||||
<article class="testquestion mb-4">
|
<article class="testquestion mb-4">
|
||||||
<div class="pyt"><div class="question-header"><span class="question-number"><?php echo ($number + 1) . '.'; ?></span><div class="question-text"><?php echo $item->question; ?></div></div></div>
|
<div class="pyt"><div class="question-header"><span class="question-number"><?php echo ($number + 1) . '.'; ?></span><div class="question-text"><?php echo $item->question; ?></div></div></div>
|
||||||
@@ -96,3 +105,48 @@ use Joomla\CMS\Factory;
|
|||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</div>
|
</div>
|
||||||
|
<?php if ($this->started && !$this->results && ((int) $this->set->duration + $extraTime) > 0) : ?>
|
||||||
|
<script>
|
||||||
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
|
const container = document.getElementById('test-timer-container');
|
||||||
|
const text = document.getElementById('test-timer-text');
|
||||||
|
const ring = document.getElementById('test-timer-ring');
|
||||||
|
const form = document.getElementById('test-form');
|
||||||
|
|
||||||
|
if (!container || !text || !ring || !form) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const total = parseInt(container.dataset.duration, 10);
|
||||||
|
const circumference = 2 * Math.PI * 54;
|
||||||
|
let remaining = total;
|
||||||
|
let submitted = false;
|
||||||
|
|
||||||
|
ring.style.strokeDasharray = circumference + ' ' + circumference;
|
||||||
|
|
||||||
|
const update = function () {
|
||||||
|
const minutes = Math.floor(remaining / 60);
|
||||||
|
const seconds = remaining % 60;
|
||||||
|
const ratio = remaining / total;
|
||||||
|
text.textContent = String(minutes).padStart(2, '0') + ':' + String(seconds).padStart(2, '0');
|
||||||
|
ring.style.strokeDashoffset = circumference * (1 - remaining / total);
|
||||||
|
ring.style.stroke = ratio <= 0.1 ? '#dc3545' : (ratio <= 0.2 ? '#fd7e14' : '#4a86cf');
|
||||||
|
|
||||||
|
if (remaining <= 0 && !submitted) {
|
||||||
|
submitted = true;
|
||||||
|
form.submit();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
update();
|
||||||
|
const interval = window.setInterval(function () {
|
||||||
|
remaining -= 1;
|
||||||
|
update();
|
||||||
|
|
||||||
|
if (submitted) {
|
||||||
|
window.clearInterval(interval);
|
||||||
|
}
|
||||||
|
}, 1000);
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
<?php endif; ?>
|
||||||
|
|||||||
+12
@@ -154,6 +154,18 @@ div.odpup
|
|||||||
gap: .25rem;
|
gap: .25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.com-testquestions #test-timer-container {
|
||||||
|
position: fixed;
|
||||||
|
left: 2rem;
|
||||||
|
bottom: 2rem;
|
||||||
|
z-index: 1050;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
background: transparent;
|
||||||
|
border: 0;
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
.com-testquestions .question-number {
|
.com-testquestions .question-number {
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
|||||||
Reference in New Issue
Block a user