Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
08220dc6e8 |
@@ -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.9).
|
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.10).
|
||||||
|
|
||||||
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
|
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
|
||||||
|
|||||||
@@ -107,6 +107,7 @@ COM_TESTQUESTIONS_RESULT_PREVIEW="Podgląd zapisanego testu"
|
|||||||
COM_TESTQUESTIONS_RESULT_NOT_FOUND="Nie znaleziono zapisanego testu."
|
COM_TESTQUESTIONS_RESULT_NOT_FOUND="Nie znaleziono zapisanego testu."
|
||||||
COM_TESTQUESTIONS_RESULT_PARTICIPANT="Użytkownik"
|
COM_TESTQUESTIONS_RESULT_PARTICIPANT="Użytkownik"
|
||||||
COM_TESTQUESTIONS_RESULT_AI_TOKENS="Tokeny AI"
|
COM_TESTQUESTIONS_RESULT_AI_TOKENS="Tokeny AI"
|
||||||
|
COM_TESTQUESTIONS_RESULTS_AI_TOKENS_TOTAL="Łączne wykorzystanie tokenów w wynikach"
|
||||||
COM_TESTQUESTIONS_RESULT_SCORE="Wynik"
|
COM_TESTQUESTIONS_RESULT_SCORE="Wynik"
|
||||||
COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER="Punkty przed / po korekcie"
|
COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER="Punkty przed / po korekcie"
|
||||||
COM_TESTQUESTIONS_RESULT_GRADE="Ocena"
|
COM_TESTQUESTIONS_RESULT_GRADE="Ocena"
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.10.
|
||||||
@@ -51,6 +51,44 @@ class ResultsModel extends ListModel
|
|||||||
return $items;
|
return $items;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getAiUsageTotals(): array
|
||||||
|
{
|
||||||
|
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||||
|
$query = clone $this->getListQuery();
|
||||||
|
$query->clear('select')->clear('order')->select($db->quoteName('r.answers'));
|
||||||
|
$answersRows = $db->setQuery($query)->loadColumn();
|
||||||
|
$totals = ['input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0];
|
||||||
|
|
||||||
|
foreach ($answersRows as $answersJson) {
|
||||||
|
$answers = json_decode((string) $answersJson, true);
|
||||||
|
if (!is_array($answers)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
foreach ($answers as $answer) {
|
||||||
|
if (!is_array($answer)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$usages = $answer['ai_usage_history'] ?? (isset($answer['ai_usage']) ? [$answer['ai_usage']] : []);
|
||||||
|
if (!is_array($usages)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
foreach ($usages as $usage) {
|
||||||
|
if (!is_array($usage)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$totals['input_tokens'] += (int) ($usage['input_tokens'] ?? 0);
|
||||||
|
$totals['output_tokens'] += (int) ($usage['output_tokens'] ?? 0);
|
||||||
|
$totals['total_tokens'] += (int) ($usage['total_tokens'] ?? 0);
|
||||||
|
if (is_numeric($usage['cost_usd'] ?? null)) {
|
||||||
|
$totals['cost_usd'] += (float) $usage['cost_usd'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $totals;
|
||||||
|
}
|
||||||
|
|
||||||
protected function populateState($ordering = 'r.created', $direction = 'desc')
|
protected function populateState($ordering = 'r.created', $direction = 'desc')
|
||||||
{
|
{
|
||||||
parent::populateState($ordering, $direction);
|
parent::populateState($ordering, $direction);
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ class HtmlView extends BaseHtmlView
|
|||||||
protected $pagination;
|
protected $pagination;
|
||||||
protected $state;
|
protected $state;
|
||||||
protected $sets;
|
protected $sets;
|
||||||
|
protected $aiUsageTotals;
|
||||||
|
|
||||||
public function display($tpl = null)
|
public function display($tpl = null)
|
||||||
{
|
{
|
||||||
@@ -22,6 +23,7 @@ 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->sets = $this->get('Sets');
|
$this->sets = $this->get('Sets');
|
||||||
|
$this->aiUsageTotals = $this->get('AiUsageTotals');
|
||||||
ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULTS'));
|
ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULTS'));
|
||||||
ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
|
ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
|
||||||
|
|
||||||
|
|||||||
@@ -33,15 +33,24 @@ use Joomla\CMS\Router\Route;
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-md-3 align-self-end"><button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button></div>
|
<div class="col-md-3 align-self-end"><button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button></div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="alert alert-info" role="status">
|
||||||
|
<strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_AI_TOKENS_TOTAL'); ?>:</strong>
|
||||||
|
<?php echo number_format((int) $this->aiUsageTotals['total_tokens'], 0, ',', ' '); ?> <?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_TOTAL')); ?>
|
||||||
|
(<?php echo number_format((int) $this->aiUsageTotals['input_tokens'], 0, ',', ' '); ?> in /
|
||||||
|
<?php echo number_format((int) $this->aiUsageTotals['output_tokens'], 0, ',', ' '); ?> out)
|
||||||
|
<?php if ($this->aiUsageTotals['cost_usd'] > 0) : ?>
|
||||||
|
· <?php echo number_format((float) $this->aiUsageTotals['cost_usd'], 8, ',', ' '); ?> USD
|
||||||
|
<?php endif; ?>
|
||||||
|
</div>
|
||||||
<table class="table table-striped">
|
<table class="table table-striped">
|
||||||
<thead><tr>
|
<thead><tr>
|
||||||
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_PARTICIPANT'); ?></th>
|
<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_SET_TITLE'); ?></th>
|
||||||
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER'); ?></th>
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER'); ?></th>
|
||||||
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_AI_TOKENS'); ?></th>
|
|
||||||
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_GRADE'); ?></th>
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_GRADE'); ?></th>
|
||||||
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_EXECUTION_TIME'); ?></th>
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_EXECUTION_TIME'); ?></th>
|
||||||
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_DATE'); ?></th>
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_DATE'); ?></th>
|
||||||
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_AI_TOKENS'); ?></th>
|
||||||
</tr></thead>
|
</tr></thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<?php foreach ($this->items as $item) : ?>
|
<?php foreach ($this->items as $item) : ?>
|
||||||
@@ -56,6 +65,9 @@ use Joomla\CMS\Router\Route;
|
|||||||
<?php if ($pointsAfterPercentage >= $gradeScale[1]) { $grade = $gradeScale[0]; break; } ?>
|
<?php if ($pointsAfterPercentage >= $gradeScale[1]) { $grade = $gradeScale[0]; break; } ?>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
<td><?php echo (int) $item->points_before; ?> (<?php echo $pointsBeforePercentage; ?>%) / <?php echo (int) $item->points_after; ?> (<?php echo $pointsAfterPercentage; ?>%)</td>
|
<td><?php echo (int) $item->points_before; ?> (<?php echo $pointsBeforePercentage; ?>%) / <?php echo (int) $item->points_after; ?> (<?php echo $pointsAfterPercentage; ?>%)</td>
|
||||||
|
<td><?php echo $this->escape($grade); ?></td>
|
||||||
|
<td><?php echo floor((int) $item->execution_time / 60); ?>:<?php echo str_pad((string) ((int) $item->execution_time % 60), 2, '0', STR_PAD_LEFT); ?></td>
|
||||||
|
<td><?php echo HTMLHelper::_('date', $item->created, 'Y-m-d H:i'); ?></td>
|
||||||
<td>
|
<td>
|
||||||
<?php if ($item->ai_total_tokens > 0) : ?>
|
<?php if ($item->ai_total_tokens > 0) : ?>
|
||||||
<?php echo number_format((int) $item->ai_total_tokens, 0, ',', ' '); ?> <?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_TOTAL')); ?>
|
<?php echo number_format((int) $item->ai_total_tokens, 0, ',', ' '); ?> <?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_TOTAL')); ?>
|
||||||
@@ -68,9 +80,6 @@ use Joomla\CMS\Router\Route;
|
|||||||
—
|
—
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</td>
|
</td>
|
||||||
<td><?php echo $this->escape($grade); ?></td>
|
|
||||||
<td><?php echo floor((int) $item->execution_time / 60); ?>:<?php echo str_pad((string) ((int) $item->execution_time % 60), 2, '0', STR_PAD_LEFT); ?></td>
|
|
||||||
<td><?php echo HTMLHelper::_('date', $item->created, 'Y-m-d H:i'); ?></td>
|
|
||||||
</tr>
|
</tr>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -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.9</version>
|
<version>1.43.10</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>
|
||||||
|
|||||||
Reference in New Issue
Block a user