diff --git a/README.md b/README.md index 725772b..a70c6d3 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,6 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych. ## Instalacja -W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.8). +W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.9). Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**. diff --git a/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini b/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini index bf70c08..4107421 100644 --- a/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini +++ b/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini @@ -106,6 +106,7 @@ 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_AI_TOKENS="Tokeny AI" COM_TESTQUESTIONS_RESULT_SCORE="Wynik" COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER="Punkty przed / po korekcie" COM_TESTQUESTIONS_RESULT_GRADE="Ocena" diff --git a/administrator/components/com_testquestions/sql/updates/mysql/1.43.9.sql b/administrator/components/com_testquestions/sql/updates/mysql/1.43.9.sql new file mode 100644 index 0000000..d1baeae --- /dev/null +++ b/administrator/components/com_testquestions/sql/updates/mysql/1.43.9.sql @@ -0,0 +1 @@ +-- No database changes required for version 1.43.9. diff --git a/administrator/components/com_testquestions/src/Model/ResultsModel.php b/administrator/components/com_testquestions/src/Model/ResultsModel.php index 903d649..8616c8e 100644 --- a/administrator/components/com_testquestions/src/Model/ResultsModel.php +++ b/administrator/components/com_testquestions/src/Model/ResultsModel.php @@ -9,6 +9,48 @@ use Joomla\CMS\MVC\Model\ListModel; class ResultsModel extends ListModel { + public function getItems() + { + $items = parent::getItems(); + + foreach ($items as $item) { + $item->ai_input_tokens = 0; + $item->ai_output_tokens = 0; + $item->ai_total_tokens = 0; + $item->ai_cost_usd = 0.0; + + $answers = json_decode((string) ($item->answers ?? ''), 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; + } + $item->ai_input_tokens += (int) ($usage['input_tokens'] ?? 0); + $item->ai_output_tokens += (int) ($usage['output_tokens'] ?? 0); + $item->ai_total_tokens += (int) ($usage['total_tokens'] ?? 0); + if (is_numeric($usage['cost_usd'] ?? null)) { + $item->ai_cost_usd += (float) $usage['cost_usd']; + } + } + } + } + + return $items; + } + protected function populateState($ordering = 'r.created', $direction = 'desc') { parent::populateState($ordering, $direction); diff --git a/administrator/components/com_testquestions/tmpl/results/default.php b/administrator/components/com_testquestions/tmpl/results/default.php index 93d1acc..d5d4a60 100644 --- a/administrator/components/com_testquestions/tmpl/results/default.php +++ b/administrator/components/com_testquestions/tmpl/results/default.php @@ -38,6 +38,7 @@ use Joomla\CMS\Router\Route; + @@ -55,6 +56,18 @@ use Joomla\CMS\Router\Route; = $gradeScale[1]) { $grade = $gradeScale[0]; break; } ?> points_before; ?> (%) / points_after; ?> (%) + + ai_total_tokens > 0) : ?> + ai_total_tokens, 0, ',', ' '); ?> escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_TOTAL')); ?> + + ai_input_tokens, 0, ',', ' '); ?> in / + ai_output_tokens, 0, ',', ' '); ?> out + ai_cost_usd > 0) : ?> · ai_cost_usd, 8, ',', ' '); ?> USD + + + — + + escape($grade); ?> execution_time / 60); ?>:execution_time % 60), 2, '0', STR_PAD_LEFT); ?> created, 'Y-m-d H:i'); ?> diff --git a/com_testquestions.xml b/com_testquestions.xml index a2b0a11..8bbe7c9 100644 --- a/com_testquestions.xml +++ b/com_testquestions.xml @@ -4,7 +4,7 @@ 2026-10-14 Komponent GNU General Public License version 2 or later - 1.43.8 + 1.43.9 COM_TESTQUESTIONS_DESCRIPTION com_testquestions Komponent\Component\Testquestions