Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d15fd05a8 | ||
|
|
bcd9335a47 | ||
|
|
4ceb5fd01c | ||
|
|
d4894f61ee | ||
|
|
14f2eec18d | ||
|
|
2bc1b30704 | ||
|
|
c9ba3df1f3 | ||
|
|
d0989e78d1 | ||
|
|
24802b8b53 | ||
|
|
252c72be3d | ||
|
|
42af47ea2e | ||
|
|
686e927249 | ||
|
|
8045698072 | ||
|
|
032ffeb9da |
@@ -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.25).
|
||||
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.39).
|
||||
|
||||
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
<field name="ai_provider" type="list" label="COM_TESTQUESTIONS_AI_PROVIDER">
|
||||
<option value="openai">OpenAI</option>
|
||||
<option value="grok">Grok</option>
|
||||
<option value="groq">Groq</option>
|
||||
<option value="gemini">Gemini</option>
|
||||
</field>
|
||||
<field name="ai_api_key" type="aiapikey" addfieldprefix="Komponent\Component\Testquestions\Administrator\Field" label="COM_TESTQUESTIONS_AI_API_KEY" filter="raw" autocomplete="off" size="120" class="w-100" />
|
||||
</fieldset>
|
||||
|
||||
@@ -71,8 +71,12 @@ COM_TESTQUESTIONS_AI_PROVIDER="Dostawca AI"
|
||||
COM_TESTQUESTIONS_AI_API_KEY="Klucz API"
|
||||
COM_TESTQUESTIONS_AI_OPENAI_KEY="Klucz API OpenAI"
|
||||
COM_TESTQUESTIONS_AI_GROK_KEY="Klucz API Grok"
|
||||
COM_TESTQUESTIONS_AI_GROQ_KEY="Klucz API Groq"
|
||||
COM_TESTQUESTIONS_AI_GEMINI_KEY="Klucz API Gemini"
|
||||
COM_TESTQUESTIONS_AI_OPENAI_MODEL="Model OpenAI"
|
||||
COM_TESTQUESTIONS_AI_GROK_MODEL="Model Grok"
|
||||
COM_TESTQUESTIONS_AI_GROQ_MODEL="Model Groq API"
|
||||
COM_TESTQUESTIONS_AI_GEMINI_MODEL="Model Gemini"
|
||||
COM_TESTQUESTIONS_AI_MODEL_INVALID="Wybierz prawidłowy model dla każdego dostawcy AI."
|
||||
COM_TESTQUESTIONS_AI_TOKEN_USAGE="Wykorzystanie tokenów API"
|
||||
COM_TESTQUESTIONS_AI_TOKEN_USAGE_INFO="Suma użycia zapisanego przy ocenach AI we wszystkich wynikach testów. Powtórne oceny są zliczane, jeśli zostały wykonane po tej aktualizacji."
|
||||
@@ -126,6 +130,8 @@ COM_TESTQUESTIONS_RESULTS_AI_TOKENS_TOTAL="Łączne wykorzystanie tokenów w wyn
|
||||
COM_TESTQUESTIONS_RESULT_SCORE="Wynik"
|
||||
COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER="Punkty przed / po korekcie"
|
||||
COM_TESTQUESTIONS_RESULT_GRADE="Ocena"
|
||||
COM_TESTQUESTIONS_RESULT_NOT_ASSESSED="Nie sprawdzono"
|
||||
COM_TESTQUESTIONS_RESULT_GENERATE_PDF="Generuj PDF / drukuj"
|
||||
COM_TESTQUESTIONS_RESULT_DATE="Data zakończenia"
|
||||
COM_TESTQUESTIONS_RESULT_ANSWERS="Odpowiedzi"
|
||||
COM_TESTQUESTIONS_RESULT_EXECUTION_TIME="Czas wykonania"
|
||||
@@ -139,10 +145,13 @@ COM_TESTQUESTIONS_RESULTS_TEST_NAME="Nazwa testu"
|
||||
COM_TESTQUESTIONS_RESULTS_ALL_TESTS="Wszystkie zestawy"
|
||||
COM_TESTQUESTIONS_RESULTS_DATE_FROM="Data od"
|
||||
COM_TESTQUESTIONS_RESULTS_DATE_TO="Data do"
|
||||
COM_TESTQUESTIONS_RESULTS_DELETED="Usunięto %s zapisanych testów."
|
||||
COM_TESTQUESTIONS_RESULTS_DELETE_NONE="Zaznacz testy, które chcesz usunąć."
|
||||
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_ANSWER_PARTIALLY_CORRECT="Odpowiedź częściowo poprawna"
|
||||
COM_TESTQUESTIONS_CORRECT_PATTERN="Wzorzec poprawnej odpowiedzi"
|
||||
COM_TESTQUESTIONS_SUBJECT="Przedmiot"
|
||||
COM_TESTQUESTIONS_SUBJECT_TITLE="Nazwa przedmiotu"
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
-- Wydanie 1.43.26: dodano zbiorcze usuwanie zapisanych testów.
|
||||
@@ -0,0 +1 @@
|
||||
-- Wydanie 1.43.27: dodano dostawcę Groq API.
|
||||
@@ -0,0 +1 @@
|
||||
-- Wydanie 1.43.28: dodano dostawcę Gemini API.
|
||||
@@ -0,0 +1 @@
|
||||
-- Wydanie 1.43.29: ograniczono czas generowania oceny przez Gemini.
|
||||
@@ -0,0 +1 @@
|
||||
-- Wydanie 1.43.30: odczyt tokenów Gemini z pola usageMetadata.
|
||||
@@ -0,0 +1 @@
|
||||
-- Brak zmian w schemacie bazy danych w wersji 1.43.31.
|
||||
@@ -0,0 +1 @@
|
||||
-- Brak zmian w schemacie bazy danych w wersji 1.43.32.
|
||||
@@ -0,0 +1 @@
|
||||
-- Brak zmian w schemacie bazy danych w wersji 1.43.33.
|
||||
@@ -0,0 +1 @@
|
||||
-- Brak zmian w schemacie bazy danych w wersji 1.43.34.
|
||||
@@ -0,0 +1 @@
|
||||
-- Brak zmian w schemacie bazy danych w wersji 1.43.35.
|
||||
@@ -0,0 +1 @@
|
||||
-- Brak zmian w schemacie bazy danych w wersji 1.43.36.
|
||||
@@ -0,0 +1 @@
|
||||
-- Brak zmian w schemacie bazy danych w wersji 1.43.37.
|
||||
@@ -0,0 +1 @@
|
||||
-- Brak zmian w schemacie bazy danych w wersji 1.43.38.
|
||||
@@ -0,0 +1 @@
|
||||
-- Brak zmian w schemacie bazy danych w wersji 1.43.39.
|
||||
@@ -36,14 +36,14 @@ class AiController extends BaseController
|
||||
|
||||
$input = Factory::getApplication()->getInput();
|
||||
$provider = strtolower($input->post->getCmd('ai_provider', ''));
|
||||
if (!in_array($provider, ['openai', 'grok'], true)) {
|
||||
if (!in_array($provider, ['openai', 'grok', 'groq', 'gemini'], true)) {
|
||||
throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_PROVIDER_INVALID'));
|
||||
}
|
||||
|
||||
$models = AiService::availableModels();
|
||||
$selectedModels = [];
|
||||
foreach (['openai', 'grok'] as $modelProvider) {
|
||||
$model = $input->post->getCmd('ai_' . $modelProvider . '_model', '');
|
||||
foreach (['openai', 'grok', 'groq', 'gemini'] as $modelProvider) {
|
||||
$model = trim($input->post->getString('ai_' . $modelProvider . '_model', ''));
|
||||
if (!isset($models[$modelProvider][$model])) {
|
||||
throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_MODEL_INVALID'));
|
||||
}
|
||||
@@ -71,7 +71,7 @@ class AiController extends BaseController
|
||||
$settings['ai_' . $modelProvider . '_model'] = $model;
|
||||
}
|
||||
|
||||
foreach (['openai', 'grok'] as $keyProvider) {
|
||||
foreach (['openai', 'grok', 'groq', 'gemini'] as $keyProvider) {
|
||||
$fieldName = 'ai_' . $keyProvider . '_api_key';
|
||||
$apiKey = trim((string) $input->post->get($fieldName, '', 'RAW'));
|
||||
if ($apiKey !== '') {
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
<?php
|
||||
|
||||
namespace Komponent\Component\Testquestions\Administrator\Controller;
|
||||
|
||||
defined('_JEXEC') or die;
|
||||
|
||||
use Joomla\CMS\Factory;
|
||||
use Joomla\CMS\Language\Text;
|
||||
use Joomla\CMS\MVC\Controller\AdminController;
|
||||
use Joomla\CMS\Router\Route;
|
||||
use Joomla\CMS\Session\Session;
|
||||
|
||||
class ResultsController extends AdminController
|
||||
{
|
||||
public function delete()
|
||||
{
|
||||
if (!Session::checkToken()) {
|
||||
throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
|
||||
}
|
||||
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
if (!$user->authorise('core.delete', 'com_testquestions')) {
|
||||
throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
|
||||
}
|
||||
|
||||
$ids = array_values(array_unique(array_filter(array_map(
|
||||
'intval',
|
||||
(array) $this->input->post->get('cid', [], 'array')
|
||||
), static function ($id) {
|
||||
return $id > 0;
|
||||
})));
|
||||
|
||||
if (!$ids) {
|
||||
$this->setRedirect(
|
||||
Route::_('index.php?option=com_testquestions&view=results', false),
|
||||
Text::_('COM_TESTQUESTIONS_RESULTS_DELETE_NONE'),
|
||||
'warning'
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||
$db->setQuery(
|
||||
$db->getQuery(true)
|
||||
->delete($db->quoteName('#__testquestions_results'))
|
||||
->where($db->quoteName('id') . ' IN (' . implode(',', $ids) . ')')
|
||||
)->execute();
|
||||
|
||||
$this->setRedirect(
|
||||
Route::_('index.php?option=com_testquestions&view=results', false),
|
||||
Text::sprintf('COM_TESTQUESTIONS_RESULTS_DELETED', $db->getAffectedRows())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -96,7 +96,7 @@ class ResultModel extends BaseDatabaseModel
|
||||
$keyName = 'ai_' . $provider . '_api_key';
|
||||
$apiKey = trim((string) $params->get($keyName, $params->get('ai_api_key', '')));
|
||||
$componentKeyLength = mb_strlen($apiKey);
|
||||
$defaultModels = ['openai' => 'gpt-4.1-mini', 'grok' => 'grok-4.7'];
|
||||
$defaultModels = ['openai' => 'gpt-4.1-mini', 'grok' => 'grok-4.7', 'groq' => 'openai/gpt-oss-120b', 'gemini' => 'gemini-3.8-flash'];
|
||||
$model = trim((string) $params->get('ai_' . $provider . '_model', $defaultModels[$provider] ?? ''));
|
||||
|
||||
// Odczytaj zapisane parametry bezpośrednio z bazy. Dzięki temu nie użyjemy
|
||||
|
||||
@@ -14,11 +14,12 @@ class ResultsModel extends ListModel
|
||||
$items = parent::getItems();
|
||||
|
||||
foreach ($items as $item) {
|
||||
$item->has_assessment = false;
|
||||
$item->ai_input_tokens = 0;
|
||||
$item->ai_output_tokens = 0;
|
||||
$item->ai_total_tokens = 0;
|
||||
$item->ai_cost_usd = 0.0;
|
||||
$item->ai_tokens_by_provider = ['openai' => 0, 'grok' => 0];
|
||||
$item->ai_tokens_by_provider = ['openai' => 0, 'grok' => 0, 'groq' => 0, 'gemini' => 0];
|
||||
|
||||
$answers = json_decode((string) ($item->answers ?? ''), true);
|
||||
if (!is_array($answers)) {
|
||||
@@ -30,6 +31,11 @@ class ResultsModel extends ListModel
|
||||
continue;
|
||||
}
|
||||
|
||||
// Manual assessment and AI both save awarded_points in the answer JSON.
|
||||
if (array_key_exists('awarded_points', $answer)) {
|
||||
$item->has_assessment = true;
|
||||
}
|
||||
|
||||
$usages = $answer['ai_usage_history'] ?? (isset($answer['ai_usage']) ? [$answer['ai_usage']] : []);
|
||||
if (!is_array($usages)) {
|
||||
continue;
|
||||
@@ -68,7 +74,7 @@ class ResultsModel extends ListModel
|
||||
'output_tokens' => 0,
|
||||
'total_tokens' => 0,
|
||||
'cost_usd' => 0.0,
|
||||
'providers' => ['openai' => $emptyProviderTotals, 'grok' => $emptyProviderTotals],
|
||||
'providers' => ['openai' => $emptyProviderTotals, 'grok' => $emptyProviderTotals, 'groq' => $emptyProviderTotals, 'gemini' => $emptyProviderTotals],
|
||||
];
|
||||
|
||||
foreach ($answersRows as $answersJson) {
|
||||
|
||||
@@ -23,6 +23,15 @@ class AiService
|
||||
'grok-4.20' => 'Grok 4.20 Reasoning',
|
||||
'grok-4.20-non-reasoning' => 'Grok 4.20 Non-Reasoning',
|
||||
],
|
||||
'groq' => [
|
||||
'openai/gpt-oss-120b' => 'GPT OSS 120B',
|
||||
'openai/gpt-oss-20b' => 'GPT OSS 20B',
|
||||
'llama-3.3-70b-versatile' => 'Llama 3.3 70B Versatile',
|
||||
],
|
||||
'gemini' => [
|
||||
'gemini-3.8-flash' => 'Gemini 3.8 Flash',
|
||||
'gemini-3.1-pro-preview' => 'Gemini 3.1 Pro (Preview)',
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
@@ -30,15 +39,18 @@ class AiService
|
||||
{
|
||||
$provider = strtolower(trim($provider));
|
||||
$provider = preg_replace('/[^a-z]/', '', $provider);
|
||||
$config = $provider === 'grok'
|
||||
? ['url' => 'https://api.x.ai/v1/responses']
|
||||
: ['url' => 'https://api.openai.com/v1/responses'];
|
||||
$config = match ($provider) {
|
||||
'grok' => ['url' => 'https://api.x.ai/v1/responses'],
|
||||
'groq' => ['url' => 'https://api.groq.com/openai/v1/chat/completions'],
|
||||
'gemini' => ['url' => 'https://generativelanguage.googleapis.com/v1beta/models/' . rawurlencode($model) . ':generateContent'],
|
||||
default => ['url' => 'https://api.openai.com/v1/responses'],
|
||||
};
|
||||
|
||||
if (trim($apiKey) === '') {
|
||||
throw new \RuntimeException('AI_NOT_CONFIGURED');
|
||||
}
|
||||
|
||||
if (!in_array($provider, ['openai', 'grok'], true)) {
|
||||
if (!in_array($provider, ['openai', 'grok', 'groq', 'gemini'], true)) {
|
||||
throw new \RuntimeException('Nieprawidłowy dostawca AI: ' . $provider);
|
||||
}
|
||||
|
||||
@@ -54,24 +66,45 @@ class AiService
|
||||
. "Odpowiedź ucznia:\n" . ($answer !== '' ? $answer : 'Brak odpowiedzi') . "\n\n"
|
||||
. "Zwróć wyłącznie poprawny obiekt JSON w formacie {\"awarded_points\": liczba_całkowita, \"feedback\": \"krótka ocena po polsku\"}. W ocenie opisz poprawne i brakujące elementy. Nie zmieniaj wzorca odpowiedzi.";
|
||||
|
||||
$requestData = [
|
||||
$requestData = match ($provider) {
|
||||
'groq' => [
|
||||
'model' => $model,
|
||||
'messages' => [['role' => 'user', 'content' => $input]],
|
||||
'temperature' => 0.1,
|
||||
],
|
||||
'gemini' => [
|
||||
'contents' => [['parts' => [['text' => $input]]]],
|
||||
'generationConfig' => [
|
||||
'maxOutputTokens' => 256,
|
||||
'responseMimeType' => 'application/json',
|
||||
'thinkingConfig' => ['thinkingLevel' => 'low'],
|
||||
],
|
||||
],
|
||||
default => [
|
||||
'model' => $model,
|
||||
'input' => $input,
|
||||
];
|
||||
],
|
||||
};
|
||||
// GPT-5.x reasoning models do not accept a custom temperature.
|
||||
if ($provider === 'grok' || $model === 'gpt-4.1-mini') {
|
||||
if ($provider === 'grok' || ($provider === 'openai' && $model === 'gpt-4.1-mini')) {
|
||||
$requestData['temperature'] = 0.1;
|
||||
}
|
||||
$payload = json_encode($requestData, JSON_UNESCAPED_UNICODE);
|
||||
|
||||
$headers = [
|
||||
'Content-Type' => 'application/json',
|
||||
];
|
||||
if ($provider === 'gemini') {
|
||||
$headers['x-goog-api-key'] = trim($apiKey);
|
||||
} else {
|
||||
$headers['Authorization'] = 'Bearer ' . trim($apiKey);
|
||||
}
|
||||
|
||||
$response = HttpFactory::getHttp()->post(
|
||||
$config['url'],
|
||||
$payload,
|
||||
[
|
||||
'Authorization' => 'Bearer ' . trim($apiKey),
|
||||
'Content-Type' => 'application/json',
|
||||
],
|
||||
60
|
||||
$headers,
|
||||
$provider === 'gemini' ? 25 : 60
|
||||
);
|
||||
$body = json_decode((string) $response->body, true);
|
||||
|
||||
@@ -114,14 +147,22 @@ class AiService
|
||||
|
||||
private function getUsage(array $body, string $provider, string $model): ?array
|
||||
{
|
||||
$usage = $body['usage'] ?? null;
|
||||
if (!is_array($usage) || !isset($usage['input_tokens'], $usage['output_tokens'])) {
|
||||
// Gemini uses camelCase UsageMetadata at the response root; the
|
||||
// OpenAI-compatible providers return their counters in `usage`.
|
||||
$usage = $body['usageMetadata'] ?? $body['usage'] ?? null;
|
||||
if (!is_array($usage)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$inputTokens = max(0, (int) $usage['input_tokens']);
|
||||
$outputTokens = max(0, (int) $usage['output_tokens']);
|
||||
$cachedTokens = min($inputTokens, max(0, (int) ($usage['input_tokens_details']['cached_tokens'] ?? 0)));
|
||||
$inputTokens = max(0, (int) ($usage['input_tokens'] ?? $usage['prompt_tokens'] ?? $usage['promptTokenCount'] ?? 0));
|
||||
$outputTokens = max(0, (int) ($usage['output_tokens'] ?? $usage['completion_tokens'] ?? (
|
||||
(int) ($usage['candidatesTokenCount'] ?? 0) + (int) ($usage['thoughtsTokenCount'] ?? 0)
|
||||
)));
|
||||
if ((!isset($usage['input_tokens']) && !isset($usage['prompt_tokens']) && !isset($usage['promptTokenCount']))
|
||||
|| (!isset($usage['output_tokens']) && !isset($usage['completion_tokens']) && !isset($usage['candidatesTokenCount']))) {
|
||||
return null;
|
||||
}
|
||||
$cachedTokens = min($inputTokens, max(0, (int) ($usage['input_tokens_details']['cached_tokens'] ?? $usage['cachedContentTokenCount'] ?? 0)));
|
||||
$cost = null;
|
||||
$costSource = '';
|
||||
|
||||
@@ -142,7 +183,7 @@ class AiService
|
||||
'model' => $model,
|
||||
'input_tokens' => $inputTokens,
|
||||
'output_tokens' => $outputTokens,
|
||||
'total_tokens' => (int) ($usage['total_tokens'] ?? ($inputTokens + $outputTokens)),
|
||||
'total_tokens' => (int) ($usage['total_tokens'] ?? $usage['totalTokenCount'] ?? ($inputTokens + $outputTokens)),
|
||||
'cached_input_tokens' => $cachedTokens,
|
||||
'cost_usd' => $cost,
|
||||
'cost_source' => $costSource,
|
||||
@@ -162,6 +203,20 @@ class AiService
|
||||
|
||||
private function extractText(array $body): string
|
||||
{
|
||||
if (isset($body['candidates'][0]['content']['parts']) && is_array($body['candidates'][0]['content']['parts'])) {
|
||||
$parts = [];
|
||||
foreach ($body['candidates'][0]['content']['parts'] as $part) {
|
||||
if (isset($part['text']) && is_string($part['text'])) {
|
||||
$parts[] = $part['text'];
|
||||
}
|
||||
}
|
||||
return trim(implode("\n", $parts));
|
||||
}
|
||||
|
||||
if (isset($body['choices'][0]['message']['content']) && is_string($body['choices'][0]['message']['content'])) {
|
||||
return trim($body['choices'][0]['message']['content']);
|
||||
}
|
||||
|
||||
if (!empty($body['output_text']) && is_string($body['output_text'])) {
|
||||
return trim($body['output_text']);
|
||||
}
|
||||
|
||||
@@ -28,6 +28,8 @@ class HtmlView extends BaseHtmlView
|
||||
$this->usageTotals = [
|
||||
'openai' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
|
||||
'grok' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
|
||||
'groq' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
|
||||
'gemini' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
|
||||
];
|
||||
|
||||
$usageRows = $db->setQuery(
|
||||
|
||||
@@ -8,6 +8,7 @@ use Joomla\CMS\HTML\HTMLHelper;
|
||||
use Joomla\CMS\Language\Text;
|
||||
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
|
||||
use Joomla\CMS\Toolbar\ToolbarHelper;
|
||||
use Joomla\CMS\Factory;
|
||||
|
||||
class HtmlView extends BaseHtmlView
|
||||
{
|
||||
@@ -25,6 +26,9 @@ class HtmlView extends BaseHtmlView
|
||||
$this->sets = $this->get('Sets');
|
||||
$this->aiUsageTotals = $this->get('AiUsageTotals');
|
||||
ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULTS'));
|
||||
if (Factory::getApplication()->getIdentity()->authorise('core.delete', 'com_testquestions')) {
|
||||
ToolbarHelper::deleteList('', 'results.delete', 'JTOOLBAR_DELETE');
|
||||
}
|
||||
ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
|
||||
|
||||
return parent::display($tpl);
|
||||
|
||||
@@ -7,8 +7,12 @@
|
||||
<?php $legacyKey = (string) ($this->settings['ai_api_key'] ?? ''); ?>
|
||||
<?php $openaiKey = (string) ($this->settings['ai_openai_api_key'] ?? ($provider === 'openai' ? $legacyKey : '')); ?>
|
||||
<?php $grokKey = (string) ($this->settings['ai_grok_api_key'] ?? ($provider === 'grok' ? $legacyKey : '')); ?>
|
||||
<?php $groqKey = (string) ($this->settings['ai_groq_api_key'] ?? ($provider === 'groq' ? $legacyKey : '')); ?>
|
||||
<?php $geminiKey = (string) ($this->settings['ai_gemini_api_key'] ?? ($provider === 'gemini' ? $legacyKey : '')); ?>
|
||||
<?php $openaiModel = (string) ($this->settings['ai_openai_model'] ?? 'gpt-4.1-mini'); ?>
|
||||
<?php $grokModel = (string) ($this->settings['ai_grok_model'] ?? 'grok-4.7'); ?>
|
||||
<?php $groqModel = (string) ($this->settings['ai_groq_model'] ?? 'openai/gpt-oss-120b'); ?>
|
||||
<?php $geminiModel = (string) ($this->settings['ai_gemini_model'] ?? 'gemini-3.8-flash'); ?>
|
||||
<form action="<?php echo Route::_('index.php?option=com_testquestions&view=ai'); ?>" method="post" name="adminForm" id="adminForm">
|
||||
<div class="card" style="max-width: 900px;">
|
||||
<div class="card-body">
|
||||
@@ -17,9 +21,11 @@
|
||||
<select id="ai-provider" name="ai_provider" class="form-select" required>
|
||||
<option value="openai" <?php echo $provider === 'openai' ? 'selected' : ''; ?>>OpenAI</option>
|
||||
<option value="grok" <?php echo $provider === 'grok' ? 'selected' : ''; ?>>Grok</option>
|
||||
<option value="groq" <?php echo $provider === 'groq' ? 'selected' : ''; ?>>Groq</option>
|
||||
<option value="gemini" <?php echo $provider === 'gemini' ? 'selected' : ''; ?>>Gemini</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<div class="mb-3" data-ai-provider-section="openai">
|
||||
<label for="ai-openai-model" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_OPENAI_MODEL'); ?></label>
|
||||
<select id="ai-openai-model" name="ai_openai_model" class="form-select" required>
|
||||
<?php foreach ($availableModels['openai'] as $modelId => $modelLabel) : ?>
|
||||
@@ -27,7 +33,7 @@
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<div class="mb-3" data-ai-provider-section="openai">
|
||||
<label for="ai-openai-api-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_OPENAI_KEY'); ?></label>
|
||||
<div class="input-group">
|
||||
<input type="password" id="ai-openai-api-key" name="ai_openai_api_key" value="<?php echo htmlspecialchars($openaiKey, ENT_QUOTES, 'UTF-8'); ?>" class="form-control" size="120" maxlength="4096" autocomplete="new-password">
|
||||
@@ -37,7 +43,7 @@
|
||||
<?php echo $openaiKey !== '' ? 'Zapisany klucz: ' . mb_strlen($openaiKey) . ' znaków. Pozostaw pole bez zmian, aby go zachować.' : 'Nie zapisano klucza OpenAI.'; ?>
|
||||
</small>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<div class="mb-3" data-ai-provider-section="grok">
|
||||
<label for="ai-grok-api-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROK_KEY'); ?></label>
|
||||
<div class="input-group">
|
||||
<input type="password" id="ai-grok-api-key" name="ai_grok_api_key" value="<?php echo htmlspecialchars($grokKey, ENT_QUOTES, 'UTF-8'); ?>" class="form-control" size="120" maxlength="4096" autocomplete="new-password">
|
||||
@@ -47,7 +53,7 @@
|
||||
<?php echo $grokKey !== '' ? 'Zapisany klucz: ' . mb_strlen($grokKey) . ' znaków. Pozostaw pole bez zmian, aby go zachować.' : 'Nie zapisano klucza Grok.'; ?>
|
||||
</small>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<div class="mb-3" data-ai-provider-section="grok">
|
||||
<label for="ai-grok-model" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROK_MODEL'); ?></label>
|
||||
<select id="ai-grok-model" name="ai_grok_model" class="form-select" required>
|
||||
<?php foreach ($availableModels['grok'] as $modelId => $modelLabel) : ?>
|
||||
@@ -55,6 +61,42 @@
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
<div class="mb-3" data-ai-provider-section="groq">
|
||||
<label for="ai-groq-api-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROQ_KEY'); ?></label>
|
||||
<div class="input-group">
|
||||
<input type="password" id="ai-groq-api-key" name="ai_groq_api_key" value="<?php echo htmlspecialchars($groqKey, ENT_QUOTES, 'UTF-8'); ?>" class="form-control" size="120" maxlength="4096" autocomplete="new-password">
|
||||
<button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="ai-groq-api-key">Pokaż</button>
|
||||
</div>
|
||||
<small class="form-text text-muted">
|
||||
<?php echo $groqKey !== '' ? 'Zapisany klucz: ' . mb_strlen($groqKey) . ' znaków. Pozostaw pole bez zmian, aby go zachować.' : 'Nie zapisano klucza Groq.'; ?>
|
||||
</small>
|
||||
</div>
|
||||
<div class="mb-3" data-ai-provider-section="groq">
|
||||
<label for="ai-groq-model" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROQ_MODEL'); ?></label>
|
||||
<select id="ai-groq-model" name="ai_groq_model" class="form-select" required>
|
||||
<?php foreach ($availableModels['groq'] as $modelId => $modelLabel) : ?>
|
||||
<option value="<?php echo htmlspecialchars($modelId, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $groqModel === $modelId ? 'selected' : ''; ?>><?php echo htmlspecialchars($modelLabel, ENT_QUOTES, 'UTF-8'); ?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
<div class="mb-3" data-ai-provider-section="gemini">
|
||||
<label for="ai-gemini-api-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GEMINI_KEY'); ?></label>
|
||||
<div class="input-group">
|
||||
<input type="password" id="ai-gemini-api-key" name="ai_gemini_api_key" value="<?php echo htmlspecialchars($geminiKey, ENT_QUOTES, 'UTF-8'); ?>" class="form-control" size="120" maxlength="4096" autocomplete="new-password">
|
||||
<button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="ai-gemini-api-key">Pokaż</button>
|
||||
</div>
|
||||
<small class="form-text text-muted">
|
||||
<?php echo $geminiKey !== '' ? 'Zapisany klucz: ' . mb_strlen($geminiKey) . ' znaków. Pozostaw pole bez zmian, aby go zachować.' : 'Nie zapisano klucza Gemini.'; ?>
|
||||
</small>
|
||||
</div>
|
||||
<div class="mb-3" data-ai-provider-section="gemini">
|
||||
<label for="ai-gemini-model" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GEMINI_MODEL'); ?></label>
|
||||
<select id="ai-gemini-model" name="ai_gemini_model" class="form-select" required>
|
||||
<?php foreach ($availableModels['gemini'] as $modelId => $modelLabel) : ?>
|
||||
<option value="<?php echo htmlspecialchars($modelId, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $geminiModel === $modelId ? 'selected' : ''; ?>><?php echo htmlspecialchars($modelLabel, ENT_QUOTES, 'UTF-8'); ?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
<hr>
|
||||
<h3><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_TOKEN_USAGE'); ?></h3>
|
||||
<p class="text-muted"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_TOKEN_USAGE_INFO'); ?></p>
|
||||
@@ -71,7 +113,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach (['openai' => 'OpenAI', 'grok' => 'Grok'] as $usageProvider => $usageProviderLabel) : ?>
|
||||
<?php foreach (['openai' => 'OpenAI', 'grok' => 'Grok', 'groq' => 'Groq', 'gemini' => 'Gemini'] as $usageProvider => $usageProviderLabel) : ?>
|
||||
<?php $providerUsage = $usageTotals[$usageProvider]; ?>
|
||||
<tr>
|
||||
<th><?php echo $usageProviderLabel; ?></th>
|
||||
@@ -106,4 +148,12 @@ document.querySelectorAll('[data-ai-key-toggle]').forEach(function (button) {
|
||||
this.textContent = visible ? 'Pokaż' : 'Ukryj';
|
||||
});
|
||||
});
|
||||
const providerSelect = document.getElementById('ai-provider');
|
||||
const updateProviderFields = function () {
|
||||
document.querySelectorAll('[data-ai-provider-section]').forEach(function (section) {
|
||||
section.hidden = section.dataset.aiProviderSection !== providerSelect.value;
|
||||
});
|
||||
};
|
||||
providerSelect.addEventListener('change', updateProviderFields);
|
||||
updateProviderFields();
|
||||
</script>
|
||||
|
||||
@@ -20,10 +20,10 @@ $resolveImageUrl = static function ($path) {
|
||||
<?php if ($this->set) : ?>
|
||||
<header class="test-set-header">
|
||||
<h1><?php echo htmlspecialchars($this->set->title, ENT_QUOTES, 'UTF-8'); ?></h1>
|
||||
<?php if ($this->set->test_content) : ?><div class="test-set-content"><?php echo $this->set->test_content; ?></div><?php endif; ?>
|
||||
<?php if ($this->set->image) : ?>
|
||||
<div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($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; ?>
|
||||
</header>
|
||||
<?php endif; ?>
|
||||
<?php if (!$this->items) : ?>
|
||||
|
||||
@@ -14,6 +14,50 @@ $resolveImageUrl = static function ($path) {
|
||||
};
|
||||
?>
|
||||
<div class="container-fluid">
|
||||
<div class="mb-3 no-print">
|
||||
<button type="button" class="btn btn-outline-secondary" id="result-pdf-button">
|
||||
<span class="icon-print" aria-hidden="true"></span>
|
||||
<?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_GENERATE_PDF'); ?>
|
||||
</button>
|
||||
</div>
|
||||
<style>
|
||||
.result-pdf-comment { display: none !important; }
|
||||
@media print {
|
||||
@page { size: A4; margin: 15mm; }
|
||||
.no-print, .toolbar, #toolbar, .subhead, .sidebar-wrapper, #sidebar, .navbar,
|
||||
#system-message-container, #adminForm input, #adminForm textarea,
|
||||
#adminForm select, #adminForm button { display: none !important; }
|
||||
body, .container-main, .container-fluid { background: #fff !important; width: 100% !important; margin: 0 !important; padding: 0 !important; }
|
||||
.container-fluid { max-width: none !important; }
|
||||
article { break-inside: auto; border-color: #aaa !important; }
|
||||
img { max-width: 100% !important; max-height: 150mm; object-fit: contain; }
|
||||
.alert { print-color-adjust: exact; -webkit-print-color-adjust: exact; }
|
||||
.container-fluid .result-pdf-comment { display: block !important; }
|
||||
.result-pdf-comment-text { white-space: pre-wrap; }
|
||||
.ai-feedback-screen, .ai-token-info { display: none !important; }
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', function () {
|
||||
document.getElementById('result-pdf-button')?.addEventListener('click', function () {
|
||||
window.print();
|
||||
});
|
||||
});
|
||||
window.addEventListener('beforeprint', function () {
|
||||
document.querySelectorAll('.result-pdf-comment').forEach(function (commentBlock) {
|
||||
const questionId = commentBlock.dataset.questionId;
|
||||
const manualComment = document.getElementById('result-comment-' + questionId)?.value.trim() || '';
|
||||
const storedAiFeedback = commentBlock.querySelector('.result-pdf-ai-source')?.textContent.trim() || '';
|
||||
const visibleAiFeedback = document.querySelector('.ai-feedback-screen[data-question-id="' + questionId + '"] .ai-feedback-text')?.textContent.trim() || '';
|
||||
const aiComment = storedAiFeedback || visibleAiFeedback;
|
||||
const output = commentBlock.querySelector('.result-pdf-comment-text');
|
||||
|
||||
if (output) {
|
||||
output.textContent = manualComment || aiComment || '—';
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<dl class="row">
|
||||
<div class="row"<?php echo (int) $this->item->extra_time > 0 ? ' style="background-color: #fff3cd;"' : ''; ?>>
|
||||
<dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_PARTICIPANT'); ?></dt>
|
||||
@@ -44,27 +88,31 @@ $resolveImageUrl = static function ($path) {
|
||||
<?php if ($candidate && $candidate->question_type === 'open' && empty($answer['correct']) && trim((string) ($answer['selected'] ?? '')) !== '') { $pendingAiCount++; } ?>
|
||||
<?php endforeach; ?>
|
||||
<?php if ($pendingAiCount > 0) : ?>
|
||||
<div class="mb-3">
|
||||
<div class="mb-3 no-print">
|
||||
<button type="submit" class="btn btn-primary" formaction="<?php echo Route::_('index.php?option=com_testquestions&task=result.aiAll&id=' . (int) $this->item->id); ?>" onclick="this.form.task.value='result.aiAll';">
|
||||
<?php echo \Joomla\CMS\Language\Text::sprintf('COM_TESTQUESTIONS_AI_EVALUATE_ALL', $pendingAiCount); ?>
|
||||
</button>
|
||||
<?php
|
||||
$usageTotals = ['input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'providers' => []];
|
||||
$usageTotals = ['input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0, 'providers' => []];
|
||||
foreach ($this->item->answers as $savedAnswer) {
|
||||
$usage = $savedAnswer['ai_usage'] ?? null;
|
||||
if (!is_array($usage)) continue;
|
||||
$usageTotals['input_tokens'] += (int) ($usage['input_tokens'] ?? 0);
|
||||
$usageTotals['output_tokens'] += (int) ($usage['output_tokens'] ?? 0);
|
||||
$usageTotals['total_tokens'] += (int) ($usage['total_tokens'] ?? 0);
|
||||
if (is_numeric($usage['cost_usd'] ?? null)) $usageTotals['cost_usd'] += (float) $usage['cost_usd'];
|
||||
if (is_numeric($usage['cost_usd'] ?? null)) {
|
||||
$usageTotals['cost_usd'] += (float) $usage['cost_usd'];
|
||||
$usageTotals['cost_calls']++;
|
||||
}
|
||||
if (!empty($usage['provider'])) $usageTotals['providers'][(string) $usage['provider']] = true;
|
||||
}
|
||||
?>
|
||||
<?php if ($usageTotals['total_tokens'] > 0) : ?>
|
||||
<span class="badge text-bg-light border ms-2" title="Suma dotychczasowych ocen AI">
|
||||
✦ <?php echo implode(' + ', array_map('htmlspecialchars', array_keys($usageTotals['providers']))); ?>:
|
||||
<?php $usageProviderLabels = array_map(static function ($usageProvider) { return ['openai' => 'OpenAI', 'grok' => 'Grok', 'groq' => 'Groq', 'gemini' => 'Gemini'][$usageProvider] ?? $usageProvider; }, array_keys($usageTotals['providers'])); ?>
|
||||
<span class="badge text-bg-light border ms-2 ai-token-info" title="Suma dotychczasowych ocen AI">
|
||||
✦ <?php echo implode(' + ', array_map('htmlspecialchars', $usageProviderLabels)); ?>:
|
||||
<?php echo number_format($usageTotals['total_tokens'], 0, ',', ' '); ?> tokenów,
|
||||
<?php echo number_format($usageTotals['cost_usd'], 8, ',', ' '); ?> USD
|
||||
<?php echo $usageTotals['cost_calls'] > 0 ? number_format($usageTotals['cost_usd'], 8, ',', ' ') . ' USD' : 'koszt niedostępny'; ?>
|
||||
</span>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
@@ -73,6 +121,19 @@ $resolveImageUrl = static function ($path) {
|
||||
<?php foreach ($this->item->answers as $questionId => $answer) : ?>
|
||||
<?php $question = $this->item->questions[(int) $questionId] ?? null; if (!$question) continue; ?>
|
||||
<?php $hasResponse = trim((string) ($answer['selected'] ?? '')) !== ''; ?>
|
||||
<?php
|
||||
$answerStatusCorrect = !empty($answer['correct']);
|
||||
$answerStatusPartial = false;
|
||||
if ($question->question_type === 'open' && array_key_exists('awarded_points', $answer)) {
|
||||
$awardedPoints = (int) $answer['awarded_points'];
|
||||
$maximumPoints = (int) ($question->points ?? 0);
|
||||
$answerStatusCorrect = $awardedPoints > 0 && $awardedPoints >= $maximumPoints;
|
||||
$answerStatusPartial = $awardedPoints > 0 && !$answerStatusCorrect;
|
||||
}
|
||||
$manualComment = trim((string) ($answer['comment'] ?? ''));
|
||||
$aiComment = trim((string) ($answer['ai_feedback'] ?? ''));
|
||||
$printComment = $manualComment !== '' ? $manualComment : $aiComment;
|
||||
?>
|
||||
<article class="mb-4 border rounded p-3">
|
||||
<div class="mb-2"><?php echo $question->question; ?></div>
|
||||
<?php if (!empty($question->image)) : ?><div class="mb-3"><img src="<?php echo htmlspecialchars($resolveImageUrl($question->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy" style="max-width: 100%; height: auto;"></div><?php endif; ?>
|
||||
@@ -82,7 +143,14 @@ $resolveImageUrl = static function ($path) {
|
||||
<?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>
|
||||
<?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>
|
||||
<div class="mt-2 <?php echo $answerStatusCorrect ? 'text-success' : ($answerStatusPartial ? 'text-warning' : 'text-danger'); ?>"><?php echo $answerStatusCorrect ? '✓ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_CORRECT') : ($answerStatusPartial ? '◐ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_PARTIALLY_CORRECT') : '✗ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_INCORRECT')); ?></div>
|
||||
<?php if ($question->question_type === 'open') : ?>
|
||||
<div class="result-pdf-comment mt-3" data-question-id="<?php echo (int) $questionId; ?>" data-ai-comment="<?php echo htmlspecialchars($aiComment, ENT_QUOTES, 'UTF-8'); ?>">
|
||||
<strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_COMMENT'); ?>:</strong><br>
|
||||
<span class="result-pdf-comment-text"><?php echo htmlspecialchars($printComment !== '' ? $printComment : '—', ENT_QUOTES, 'UTF-8'); ?></span>
|
||||
<span class="result-pdf-ai-source" hidden><?php echo htmlspecialchars($aiComment, ENT_QUOTES, 'UTF-8'); ?></span>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<?php if (empty($answer['correct'])) : ?>
|
||||
<?php if ($question->question_type === 'open' && $hasResponse) : ?>
|
||||
<div class="mt-3">
|
||||
@@ -92,8 +160,8 @@ $resolveImageUrl = static function ($path) {
|
||||
<?php if (!empty($answer['ai_usage']) && is_array($answer['ai_usage'])) : ?>
|
||||
<?php $usage = $answer['ai_usage']; ?>
|
||||
<?php $usageProvider = (string) ($usage['provider'] ?? ''); ?>
|
||||
<span class="badge text-bg-light border ms-2" title="<?php echo $usageProvider === 'grok' ? 'Koszt zwrócony przez dostawcę' : 'Koszt obliczony z faktycznie wykorzystanych tokenów i stawek modelu'; ?>">
|
||||
<?php echo $usageProvider === 'grok' ? '✦ Grok' : '◉ OpenAI'; ?> ·
|
||||
<span class="badge text-bg-light border ms-2 ai-token-info" title="<?php echo $usageProvider === 'grok' ? 'Koszt zwrócony przez dostawcę' : (in_array($usageProvider, ['groq', 'gemini'], true) ? 'Dostawca zwrócił wykorzystane tokeny; koszt nie jest zwracany przez to API' : 'Koszt obliczony z faktycznie wykorzystanych tokenów i stawek modelu'); ?>">
|
||||
<?php echo $usageProvider === 'grok' ? '✦ Grok' : ($usageProvider === 'groq' ? '⚡ Groq' : ($usageProvider === 'gemini' ? '✧ Gemini' : '◉ OpenAI')); ?> ·
|
||||
<?php echo number_format((int) ($usage['input_tokens'] ?? 0), 0, ',', ' '); ?> in /
|
||||
<?php echo number_format((int) ($usage['output_tokens'] ?? 0), 0, ',', ' '); ?> out ·
|
||||
<?php echo is_numeric($usage['cost_usd'] ?? null) ? number_format((float) $usage['cost_usd'], 8, ',', ' ') . ' USD' : 'koszt niedostępny'; ?>
|
||||
@@ -107,7 +175,7 @@ $resolveImageUrl = static function ($path) {
|
||||
$maxPoints = (int) ($question->points ?? 0);
|
||||
$aiAlertClass = $aiPoints <= 0 ? 'alert-danger' : ($aiPoints >= $maxPoints ? 'alert-success' : 'alert-info');
|
||||
?>
|
||||
<div class="alert <?php echo $aiAlertClass; ?> mt-3"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_RESULT'); ?>:</strong><br><?php echo nl2br(htmlspecialchars((string) $answer['ai_feedback'], ENT_QUOTES, 'UTF-8')); ?></div>
|
||||
<div class="alert <?php echo $aiAlertClass; ?> mt-3 ai-feedback-screen" data-question-id="<?php echo (int) $questionId; ?>"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_RESULT'); ?>:</strong><br><span class="ai-feedback-text"><?php echo nl2br(htmlspecialchars((string) $answer['ai_feedback'], ENT_QUOTES, 'UTF-8')); ?></span></div>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
<?php if ($question->question_type === 'open' && $hasResponse) : ?>
|
||||
|
||||
@@ -4,6 +4,7 @@ defined('_JEXEC') or die;
|
||||
|
||||
use Joomla\CMS\HTML\HTMLHelper;
|
||||
use Joomla\CMS\Router\Route;
|
||||
HTMLHelper::_('behavior.multiselect');
|
||||
?>
|
||||
<form action="<?php echo Route::_('index.php?option=com_testquestions&view=results'); ?>" method="post" name="adminForm" id="adminForm">
|
||||
<div class="row mb-3">
|
||||
@@ -49,10 +50,23 @@ use Joomla\CMS\Router\Route;
|
||||
<?php echo number_format((int) $this->aiUsageTotals['providers']['grok']['output_tokens'], 0, ',', ' '); ?> wyj.)
|
||||
<?php if ($this->aiUsageTotals['providers']['grok']['cost_usd'] > 0) : ?> · <?php echo number_format((float) $this->aiUsageTotals['providers']['grok']['cost_usd'], 8, ',', ' '); ?> USD<?php endif; ?>
|
||||
</span>
|
||||
<span class="d-block">
|
||||
<strong>Groq:</strong>
|
||||
<?php echo number_format((int) $this->aiUsageTotals['providers']['groq']['total_tokens'], 0, ',', ' '); ?> tokenów
|
||||
(<?php echo number_format((int) $this->aiUsageTotals['providers']['groq']['input_tokens'], 0, ',', ' '); ?> wej. /
|
||||
<?php echo number_format((int) $this->aiUsageTotals['providers']['groq']['output_tokens'], 0, ',', ' '); ?> wyj.)
|
||||
</span>
|
||||
<span class="d-block">
|
||||
<strong>Gemini:</strong>
|
||||
<?php echo number_format((int) $this->aiUsageTotals['providers']['gemini']['total_tokens'], 0, ',', ' '); ?> tokenów
|
||||
(<?php echo number_format((int) $this->aiUsageTotals['providers']['gemini']['input_tokens'], 0, ',', ' '); ?> wej. /
|
||||
<?php echo number_format((int) $this->aiUsageTotals['providers']['gemini']['output_tokens'], 0, ',', ' '); ?> wyj.)
|
||||
</span>
|
||||
<span class="d-block"><strong>Łącznie:</strong> <?php echo number_format((int) $this->aiUsageTotals['total_tokens'], 0, ',', ' '); ?> tokenów</span>
|
||||
</div>
|
||||
<table class="table table-striped">
|
||||
<thead><tr>
|
||||
<th class="w-1"><?php echo HTMLHelper::_('grid.checkall'); ?></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_RESULT_POINTS_BEFORE_AFTER'); ?></th>
|
||||
@@ -62,26 +76,31 @@ use Joomla\CMS\Router\Route;
|
||||
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_AI_TOKENS'); ?></th>
|
||||
</tr></thead>
|
||||
<tbody>
|
||||
<?php foreach ($this->items as $item) : ?>
|
||||
<?php foreach ($this->items as $i => $item) : ?>
|
||||
<tr class="<?php echo (int) $item->extra_time > 0 ? 'table-warning' : ''; ?>">
|
||||
<td><?php echo HTMLHelper::_('grid.id', $i, $item->id); ?></td>
|
||||
<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>
|
||||
<?php $pointsTotal = (int) $item->points_total ?: (int) $item->total_count; ?>
|
||||
<?php $pointsBeforePercentage = $pointsTotal ? round(((int) $item->points_before / $pointsTotal) * 100, 2) : 0; ?>
|
||||
<?php $pointsAfterPercentage = $pointsTotal ? round(((int) $item->points_after / $pointsTotal) * 100, 2) : 0; ?>
|
||||
<?php if ($item->has_assessment) : ?>
|
||||
<?php $grade = 'NDST'; ?>
|
||||
<?php foreach ([['CEL', 100], ['BDB', 90], ['BDB-', 80], ['DB+', 75], ['DB', 70], ['DB-', 65], ['DST+', 60], ['DST', 55], ['DST-', 50], ['DOP+', 45], ['DOP', 40], ['DOP-', 35], ['NDST+', 30], ['NDST', 0]] as $gradeScale) : ?>
|
||||
<?php if ($pointsAfterPercentage >= $gradeScale[1]) { $grade = $gradeScale[0]; break; } ?>
|
||||
<?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 $this->escape($grade); ?></td>
|
||||
<?php endif; ?>
|
||||
<td><?php echo (int) $item->points_before; ?> (<?php echo $pointsBeforePercentage; ?>%) / <?php if ($item->has_assessment) : ?><?php echo (int) $item->points_after; ?> (<?php echo $pointsAfterPercentage; ?>%)<?php else : ?><span class="text-muted"><?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_NOT_ASSESSED')); ?></span><?php endif; ?></td>
|
||||
<td><?php echo $item->has_assessment ? $this->escape($grade) : '<span class="text-muted">' . $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_NOT_ASSESSED')) . '</span>'; ?></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>
|
||||
<?php if ($item->ai_total_tokens > 0) : ?>
|
||||
<small class="d-block text-muted">
|
||||
OpenAI: <?php echo number_format((int) $item->ai_tokens_by_provider['openai'], 0, ',', ' '); ?> ·
|
||||
Grok: <?php echo number_format((int) $item->ai_tokens_by_provider['grok'], 0, ',', ' '); ?>
|
||||
Grok: <?php echo number_format((int) $item->ai_tokens_by_provider['grok'], 0, ',', ' '); ?> ·
|
||||
Groq: <?php echo number_format((int) $item->ai_tokens_by_provider['groq'], 0, ',', ' '); ?>
|
||||
· Gemini: <?php echo number_format((int) $item->ai_tokens_by_provider['gemini'], 0, ',', ' '); ?>
|
||||
</small>
|
||||
<small class="d-block text-muted">
|
||||
<?php echo number_format((int) $item->ai_total_tokens, 0, ',', ' '); ?> łącznie
|
||||
@@ -96,6 +115,7 @@ use Joomla\CMS\Router\Route;
|
||||
</tbody>
|
||||
</table>
|
||||
<?php echo $this->pagination->getListFooter(); ?>
|
||||
<input type="hidden" name="boxchecked" value="0">
|
||||
<input type="hidden" name="task" value="">
|
||||
<?php echo HTMLHelper::_('form.token'); ?>
|
||||
</form>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<creationDate>2026-10-14</creationDate>
|
||||
<author>Komponent</author>
|
||||
<license>GNU General Public License version 2 or later</license>
|
||||
<version>1.43.25</version>
|
||||
<version>1.43.39</version>
|
||||
<description>COM_TESTQUESTIONS_DESCRIPTION</description>
|
||||
<element>com_testquestions</element>
|
||||
<namespace path="src">Komponent\Component\Testquestions</namespace>
|
||||
|
||||
@@ -67,8 +67,8 @@ $resolveImageUrl = static function ($path) {
|
||||
<?php if ($this->set->subject_title) : ?><div class="text-muted"><?php echo htmlspecialchars($this->set->subject_title, ENT_QUOTES, 'UTF-8'); ?></div><?php endif; ?>
|
||||
<h1><?php echo htmlspecialchars($this->set->title, ENT_QUOTES, 'UTF-8'); ?></h1>
|
||||
<?php if ($testDurationSeconds > 0) : ?><div class="small text-muted"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_DURATION'); ?>: <?php echo $durationMinutes; ?> min<?php if ($durationRemainder > 0) : ?> <?php echo $durationRemainder; ?> s<?php endif; ?></div><?php endif; ?>
|
||||
<?php if ($this->set->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($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->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($this->set->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
|
||||
</header>
|
||||
<?php if (!$this->results && $testDurationSeconds > 0) : ?>
|
||||
<div class="timer-container mb-4" id="test-timer-container" data-duration="<?php echo $testDurationSeconds; ?>" aria-live="polite">
|
||||
|
||||
Reference in New Issue
Block a user