Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9af456989a | ||
|
|
887b27f30b | ||
|
|
c9076d4a22 | ||
|
|
606612784c | ||
|
|
ef5410689d | ||
|
|
b774f0d94d | ||
|
|
a788c8c00e | ||
|
|
bf05c9515c | ||
|
|
08220dc6e8 | ||
|
|
42b5006574 | ||
|
|
8693720b78 | ||
|
|
37d8c6040c | ||
|
|
7ed00f95e6 | ||
|
|
57065d4ca1 | ||
|
|
7d9efd64f4 | ||
|
|
6daca5be59 | ||
|
|
dc6b5ad3e8 |
@@ -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.1).
|
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.18).
|
||||||
|
|
||||||
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
|
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
|
||||||
|
|||||||
@@ -46,6 +46,9 @@ COM_TESTQUESTIONS_ERROR_OPEN_PATTERN="Dla pytania otwartego wpisz wzorzec popraw
|
|||||||
COM_TESTQUESTIONS_ERROR_ALL_ANSWERS="Dla pytania zamkniętego uzupełnij wszystkie cztery odpowiedzi."
|
COM_TESTQUESTIONS_ERROR_ALL_ANSWERS="Dla pytania zamkniętego uzupełnij wszystkie cztery odpowiedzi."
|
||||||
COM_TESTQUESTIONS_ERROR_META="Wybierz poprawny czas i liczbę punktów."
|
COM_TESTQUESTIONS_ERROR_META="Wybierz poprawny czas i liczbę punktów."
|
||||||
COM_TESTQUESTIONS_SETS="Zestawy pytań"
|
COM_TESTQUESTIONS_SETS="Zestawy pytań"
|
||||||
|
COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL="Wyłącz wszystkie zestawy"
|
||||||
|
COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL_CONFIRM="Czy na pewno wyłączyć wszystkie zestawy testów, w tym wszystkie warianty?"
|
||||||
|
COM_TESTQUESTIONS_SETS_UNPUBLISHED_ALL="Wyłączono %s zestawów."
|
||||||
COM_TESTQUESTIONS_NEW_SET="Nowy zestaw pytań"
|
COM_TESTQUESTIONS_NEW_SET="Nowy zestaw pytań"
|
||||||
COM_TESTQUESTIONS_EDIT_SET="Edytuj zestaw pytań"
|
COM_TESTQUESTIONS_EDIT_SET="Edytuj zestaw pytań"
|
||||||
COM_TESTQUESTIONS_SET_TITLE="Nazwa zestawu"
|
COM_TESTQUESTIONS_SET_TITLE="Nazwa zestawu"
|
||||||
@@ -62,9 +65,29 @@ COM_TESTQUESTIONS_SET_REORDER_INFO="Przeciągnij pytania, aby zmienić ich kolej
|
|||||||
COM_TESTQUESTIONS_SET_SAVE="Zapisz"
|
COM_TESTQUESTIONS_SET_SAVE="Zapisz"
|
||||||
COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE="Zapisz i zamknij"
|
COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE="Zapisz i zamknij"
|
||||||
COM_TESTQUESTIONS_SET_VARIANT_DURATION_INFO="Czas testu jest pobierany z zestawu nadrzędnego."
|
COM_TESTQUESTIONS_SET_VARIANT_DURATION_INFO="Czas testu jest pobierany z zestawu nadrzędnego."
|
||||||
|
COM_TESTQUESTIONS_SET_VARIANT_STATUS_INHERITED="Status publikacji wariantu jest taki sam jak status zestawu nadrzędnego i zmienia się razem z nim."
|
||||||
COM_TESTQUESTIONS_AI_SETTINGS="Ustawienia AI"
|
COM_TESTQUESTIONS_AI_SETTINGS="Ustawienia AI"
|
||||||
COM_TESTQUESTIONS_AI_PROVIDER="Dostawca AI"
|
COM_TESTQUESTIONS_AI_PROVIDER="Dostawca AI"
|
||||||
COM_TESTQUESTIONS_AI_API_KEY="Klucz API"
|
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_OPENAI_MODEL="Model OpenAI"
|
||||||
|
COM_TESTQUESTIONS_AI_GROK_MODEL="Model Grok"
|
||||||
|
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."
|
||||||
|
COM_TESTQUESTIONS_AI_USAGE_CALLS="Liczba ocen"
|
||||||
|
COM_TESTQUESTIONS_AI_USAGE_INPUT="Tokeny wejściowe"
|
||||||
|
COM_TESTQUESTIONS_AI_USAGE_OUTPUT="Tokeny wyjściowe"
|
||||||
|
COM_TESTQUESTIONS_AI_USAGE_TOTAL="Razem tokenów"
|
||||||
|
COM_TESTQUESTIONS_AI_USAGE_COST="Koszt zapisany"
|
||||||
|
COM_TESTQUESTIONS_PREVIEW_SELECTED="Podgląd zaznaczonych"
|
||||||
|
COM_TESTQUESTIONS_PREVIEW_TITLE="Podgląd pytań testowych"
|
||||||
|
COM_TESTQUESTIONS_PREVIEW_READONLY="Tryb podglądu — odpowiedzi są nieaktywne, test nie ma limitu czasu ani przycisku zakończenia."
|
||||||
|
COM_TESTQUESTIONS_PREVIEW_EMPTY="Nie znaleziono pytań do wyświetlenia."
|
||||||
|
COM_TESTQUESTIONS_PREVIEW_SELECT_QUESTIONS="Zaznacz pytania, które chcesz podejrzeć."
|
||||||
|
COM_TESTQUESTIONS_PREVIEW_BACK="Wróć do listy pytań"
|
||||||
|
COM_TESTQUESTIONS_PREVIEW_SET="Podgląd zestawu"
|
||||||
COM_TESTQUESTIONS_AI_SETTINGS_MENU="Konfiguracja AI"
|
COM_TESTQUESTIONS_AI_SETTINGS_MENU="Konfiguracja AI"
|
||||||
COM_TESTQUESTIONS_AI_SETTINGS_SAVED="Ustawienia AI zapisano."
|
COM_TESTQUESTIONS_AI_SETTINGS_SAVED="Ustawienia AI zapisano."
|
||||||
COM_TESTQUESTIONS_AI_SAVE_FAILED="Nie udało się zapisać ustawień AI."
|
COM_TESTQUESTIONS_AI_SAVE_FAILED="Nie udało się zapisać ustawień AI."
|
||||||
@@ -82,6 +105,8 @@ COM_TESTQUESTIONS_SET_QUESTIONS="Pytania w zestawie"
|
|||||||
COM_TESTQUESTIONS_SET_QUESTION_COUNT="Liczba pytań"
|
COM_TESTQUESTIONS_SET_QUESTION_COUNT="Liczba pytań"
|
||||||
COM_TESTQUESTIONS_SET_SEARCH="Szukaj zestawów..."
|
COM_TESTQUESTIONS_SET_SEARCH="Szukaj zestawów..."
|
||||||
COM_TESTQUESTIONS_SET_CATEGORY_FILTER="Filtruj pytania według kategorii"
|
COM_TESTQUESTIONS_SET_CATEGORY_FILTER="Filtruj pytania według kategorii"
|
||||||
|
COM_TESTQUESTIONS_SET_ID_FILTER="Filtruj pytania według ID"
|
||||||
|
COM_TESTQUESTIONS_SET_ID_FILTER_HINT="Wpisz ID, np. 12, 34, 56"
|
||||||
COM_TESTQUESTIONS_SET_ALL_CATEGORIES="Wszystkie kategorie"
|
COM_TESTQUESTIONS_SET_ALL_CATEGORIES="Wszystkie kategorie"
|
||||||
COM_TESTQUESTIONS_UNCATEGORIZED="Bez kategorii"
|
COM_TESTQUESTIONS_UNCATEGORIZED="Bez kategorii"
|
||||||
COM_TESTQUESTIONS_SET_SHOW_DETAILS="Pokaż odpowiedzi"
|
COM_TESTQUESTIONS_SET_SHOW_DETAILS="Pokaż odpowiedzi"
|
||||||
@@ -94,6 +119,8 @@ COM_TESTQUESTIONS_RESULTS="Zapisane testy"
|
|||||||
COM_TESTQUESTIONS_RESULT_PREVIEW="Podgląd zapisanego testu"
|
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_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.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.11.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.12.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.13.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.14.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.15.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.16.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- Wydanie 1.43.17: zmieniono przyciski paska narzędzi podglądu zestawu.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- Wydanie 1.43.18: dodano filtrowanie dostępnych pytań po ID podczas edycji zestawu.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.2.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.3.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.4.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.5.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.6.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.7.
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
UPDATE `#__extensions`
|
||||||
|
SET `params` = JSON_REMOVE(`params`, '$.ai_grok_team_id', '$.ai_grok_management_key')
|
||||||
|
WHERE `type` = 'component'
|
||||||
|
AND `element` = 'com_testquestions'
|
||||||
|
AND JSON_VALID(`params`);
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
-- No database changes required for version 1.43.9.
|
||||||
@@ -9,10 +9,21 @@ use Joomla\CMS\Language\Text;
|
|||||||
use Joomla\CMS\MVC\Controller\BaseController;
|
use Joomla\CMS\MVC\Controller\BaseController;
|
||||||
use Joomla\CMS\Router\Route;
|
use Joomla\CMS\Router\Route;
|
||||||
use Joomla\CMS\Session\Session;
|
use Joomla\CMS\Session\Session;
|
||||||
|
use Komponent\Component\Testquestions\Administrator\Service\AiService;
|
||||||
|
|
||||||
class AiController extends BaseController
|
class AiController extends BaseController
|
||||||
{
|
{
|
||||||
public function save(): void
|
public function save(): void
|
||||||
|
{
|
||||||
|
$this->saveSettings();
|
||||||
|
|
||||||
|
$this->setRedirect(
|
||||||
|
Route::_('index.php?option=com_testquestions&view=ai', false),
|
||||||
|
Text::_('COM_TESTQUESTIONS_AI_SETTINGS_SAVED')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function saveSettings(): array
|
||||||
{
|
{
|
||||||
if (!Session::checkToken()) {
|
if (!Session::checkToken()) {
|
||||||
throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
|
throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
|
||||||
@@ -29,6 +40,16 @@ class AiController extends BaseController
|
|||||||
throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_PROVIDER_INVALID'));
|
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', '');
|
||||||
|
if (!isset($models[$modelProvider][$model])) {
|
||||||
|
throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_MODEL_INVALID'));
|
||||||
|
}
|
||||||
|
$selectedModels[$modelProvider] = $model;
|
||||||
|
}
|
||||||
|
|
||||||
$db = Factory::getContainer()->get('DatabaseDriver');
|
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||||
$row = $db->setQuery(
|
$row = $db->setQuery(
|
||||||
$db->getQuery(true)
|
$db->getQuery(true)
|
||||||
@@ -44,26 +65,35 @@ class AiController extends BaseController
|
|||||||
|
|
||||||
$settings = json_decode((string) $row->params, true);
|
$settings = json_decode((string) $row->params, true);
|
||||||
$settings = is_array($settings) ? $settings : [];
|
$settings = is_array($settings) ? $settings : [];
|
||||||
$apiKey = trim((string) $input->post->get('ai_api_key', '', 'RAW'));
|
$legacyKey = trim((string) ($settings['ai_api_key'] ?? ''));
|
||||||
|
|
||||||
$settings['ai_provider'] = $provider;
|
$settings['ai_provider'] = $provider;
|
||||||
if ($apiKey !== '') {
|
foreach ($selectedModels as $modelProvider => $model) {
|
||||||
$settings['ai_api_key'] = $apiKey;
|
$settings['ai_' . $modelProvider . '_model'] = $model;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
foreach (['openai', 'grok'] as $keyProvider) {
|
||||||
|
$fieldName = 'ai_' . $keyProvider . '_api_key';
|
||||||
|
$apiKey = trim((string) $input->post->get($fieldName, '', 'RAW'));
|
||||||
|
if ($apiKey !== '') {
|
||||||
|
$settings[$fieldName] = $apiKey;
|
||||||
|
}
|
||||||
|
if ($keyProvider === $provider && empty($settings[$fieldName]) && $legacyKey !== '') {
|
||||||
|
$settings[$fieldName] = $legacyKey;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
unset($settings['ai_api_key']);
|
||||||
|
unset($settings['ai_grok_team_id'], $settings['ai_grok_management_key']);
|
||||||
|
|
||||||
$extension = (object) [
|
$extension = (object) [
|
||||||
'extension_id' => (int) $row->extension_id,
|
'extension_id' => (int) $row->extension_id,
|
||||||
'params' => json_encode($settings, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
|
'params' => json_encode($settings, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
|
||||||
];
|
];
|
||||||
|
|
||||||
if (!$db->updateObject('#__extensions', $extension, 'extension_id')) {
|
if (!$db->updateObject('#__extensions', $extension, 'extension_id')) {
|
||||||
throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_SAVE_FAILED'));
|
throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_SAVE_FAILED'));
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->setRedirect(
|
return $settings;
|
||||||
Route::_('index.php?option=com_testquestions&view=ai', false),
|
|
||||||
Text::_('COM_TESTQUESTIONS_AI_SETTINGS_SAVED')
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function cancel(): void
|
public function cancel(): void
|
||||||
|
|||||||
@@ -4,7 +4,11 @@ namespace Komponent\Component\Testquestions\Administrator\Controller;
|
|||||||
|
|
||||||
defined('_JEXEC') or die;
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
|
use Joomla\CMS\Factory;
|
||||||
|
use Joomla\CMS\Language\Text;
|
||||||
use Joomla\CMS\MVC\Controller\AdminController;
|
use Joomla\CMS\MVC\Controller\AdminController;
|
||||||
|
use Joomla\CMS\Router\Route;
|
||||||
|
use Joomla\CMS\Session\Session;
|
||||||
|
|
||||||
class QuestionsController extends AdminController
|
class QuestionsController extends AdminController
|
||||||
{
|
{
|
||||||
@@ -14,4 +18,28 @@ class QuestionsController extends AdminController
|
|||||||
{
|
{
|
||||||
return parent::getModel($name, $prefix, $config);
|
return parent::getModel($name, $prefix, $config);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function preview(): void
|
||||||
|
{
|
||||||
|
if (!Session::checkToken()) {
|
||||||
|
throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
|
||||||
|
}
|
||||||
|
|
||||||
|
$user = Factory::getApplication()->getIdentity();
|
||||||
|
if (!$user->authorise('core.edit', 'com_testquestions') && !$user->authorise('core.manage', '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')))));
|
||||||
|
if (!$ids) {
|
||||||
|
$this->setRedirect(
|
||||||
|
Route::_('index.php?option=com_testquestions&view=questions', false),
|
||||||
|
Text::_('COM_TESTQUESTIONS_PREVIEW_SELECT_QUESTIONS'),
|
||||||
|
'warning'
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->setRedirect(Route::_('index.php?option=com_testquestions&view=preview&ids=' . implode(',', $ids), false));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,11 +5,40 @@ namespace Komponent\Component\Testquestions\Administrator\Controller;
|
|||||||
defined('_JEXEC') or die;
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
use Joomla\CMS\MVC\Controller\AdminController;
|
use Joomla\CMS\MVC\Controller\AdminController;
|
||||||
|
use Joomla\CMS\Factory;
|
||||||
|
use Joomla\CMS\Language\Text;
|
||||||
|
use Joomla\CMS\Router\Route;
|
||||||
|
use Joomla\CMS\Session\Session;
|
||||||
|
|
||||||
class SetsController extends AdminController
|
class SetsController extends AdminController
|
||||||
{
|
{
|
||||||
protected $text_prefix = 'COM_TESTQUESTIONS';
|
protected $text_prefix = 'COM_TESTQUESTIONS';
|
||||||
|
|
||||||
|
public function unpublishall(): void
|
||||||
|
{
|
||||||
|
if (!Session::checkToken()) {
|
||||||
|
throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
|
||||||
|
}
|
||||||
|
|
||||||
|
$user = Factory::getApplication()->getIdentity();
|
||||||
|
if (!$user->authorise('core.edit.state', 'com_testquestions') && !$user->authorise('core.edit', 'com_testquestions')) {
|
||||||
|
throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
|
||||||
|
}
|
||||||
|
|
||||||
|
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||||
|
$db->setQuery(
|
||||||
|
$db->getQuery(true)
|
||||||
|
->update($db->quoteName('#__testquestions_sets'))
|
||||||
|
->set($db->quoteName('published') . ' = 0')
|
||||||
|
->where($db->quoteName('published') . ' = 1')
|
||||||
|
)->execute();
|
||||||
|
|
||||||
|
$this->setRedirect(
|
||||||
|
Route::_('index.php?option=com_testquestions&view=sets', false),
|
||||||
|
Text::sprintf('COM_TESTQUESTIONS_SETS_UNPUBLISHED_ALL', $db->getAffectedRows())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
public function getModel($name = 'Set', $prefix = 'Administrator', $config = ['ignore_request' => true])
|
public function getModel($name = 'Set', $prefix = 'Administrator', $config = ['ignore_request' => true])
|
||||||
{
|
{
|
||||||
return parent::getModel($name, $prefix, $config);
|
return parent::getModel($name, $prefix, $config);
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Komponent\Component\Testquestions\Administrator\Model;
|
||||||
|
|
||||||
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
|
use Joomla\CMS\Factory;
|
||||||
|
use Joomla\CMS\MVC\Model\BaseDatabaseModel;
|
||||||
|
|
||||||
|
class PreviewModel extends BaseDatabaseModel
|
||||||
|
{
|
||||||
|
public function getSet()
|
||||||
|
{
|
||||||
|
$setId = Factory::getApplication()->getInput()->getInt('set_id');
|
||||||
|
if ($setId < 1) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||||
|
|
||||||
|
return $db->setQuery(
|
||||||
|
$db->getQuery(true)
|
||||||
|
->select(['id', 'title', 'test_content', 'image'])
|
||||||
|
->from($db->quoteName('#__testquestions_sets'))
|
||||||
|
->where($db->quoteName('id') . ' = ' . $setId)
|
||||||
|
)->loadObject();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getItems(): array
|
||||||
|
{
|
||||||
|
$input = Factory::getApplication()->getInput();
|
||||||
|
$setId = $input->getInt('set_id');
|
||||||
|
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||||
|
|
||||||
|
if ($setId > 0) {
|
||||||
|
return $db->setQuery(
|
||||||
|
$db->getQuery(true)
|
||||||
|
->select(['q.id', 'q.question_type', 'q.question', 'q.answer_a', 'q.answer_b', 'q.answer_c', 'q.answer_d', 'q.answer_open', 'q.correct_answer', 'q.image'])
|
||||||
|
->from($db->quoteName('#__testquestions_set_questions', 'sq'))
|
||||||
|
->innerJoin($db->quoteName('#__testquestions_questions', 'q') . ' ON q.id = sq.question_id')
|
||||||
|
->where('sq.set_id = ' . $setId)
|
||||||
|
->where('q.published = 1')
|
||||||
|
->order('sq.ordering ASC, q.id ASC')
|
||||||
|
)->loadObjectList();
|
||||||
|
}
|
||||||
|
|
||||||
|
$ids = array_values(array_unique(array_filter(array_map('intval', explode(',', $input->getString('ids', ''))))));
|
||||||
|
|
||||||
|
if (!$ids) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$rows = $db->setQuery(
|
||||||
|
$db->getQuery(true)
|
||||||
|
->select(['id', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'image'])
|
||||||
|
->from($db->quoteName('#__testquestions_questions'))
|
||||||
|
->where($db->quoteName('id') . ' IN (' . implode(',', $ids) . ')')
|
||||||
|
)->loadObjectList('id');
|
||||||
|
|
||||||
|
$items = [];
|
||||||
|
foreach ($ids as $id) {
|
||||||
|
if (isset($rows[$id])) {
|
||||||
|
$items[] = $rows[$id];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $items;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -92,8 +92,12 @@ class ResultModel extends BaseDatabaseModel
|
|||||||
|
|
||||||
$params = ComponentHelper::getParams('com_testquestions');
|
$params = ComponentHelper::getParams('com_testquestions');
|
||||||
$provider = trim((string) $params->get('ai_provider', 'openai'));
|
$provider = trim((string) $params->get('ai_provider', 'openai'));
|
||||||
$apiKey = trim((string) $params->get('ai_api_key', ''));
|
$provider = strtolower(preg_replace('/[^a-z]/', '', $provider));
|
||||||
|
$keyName = 'ai_' . $provider . '_api_key';
|
||||||
|
$apiKey = trim((string) $params->get($keyName, $params->get('ai_api_key', '')));
|
||||||
$componentKeyLength = mb_strlen($apiKey);
|
$componentKeyLength = mb_strlen($apiKey);
|
||||||
|
$defaultModels = ['openai' => 'gpt-4.1-mini', 'grok' => 'grok-4.7'];
|
||||||
|
$model = trim((string) $params->get('ai_' . $provider . '_model', $defaultModels[$provider] ?? ''));
|
||||||
|
|
||||||
// Odczytaj zapisane parametry bezpośrednio z bazy. Dzięki temu nie użyjemy
|
// Odczytaj zapisane parametry bezpośrednio z bazy. Dzięki temu nie użyjemy
|
||||||
// nieaktualnej wartości z pamięci ComponentHelper, a maska pola hasła
|
// nieaktualnej wartości z pamięci ComponentHelper, a maska pola hasła
|
||||||
@@ -115,14 +119,27 @@ class ResultModel extends BaseDatabaseModel
|
|||||||
if ($storedProvider !== '') {
|
if ($storedProvider !== '') {
|
||||||
$provider = $storedProvider;
|
$provider = $storedProvider;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$provider = strtolower(preg_replace('/[^a-z]/', '', $provider));
|
||||||
|
$keyName = 'ai_' . $provider . '_api_key';
|
||||||
|
$apiKey = trim((string) $params->get($keyName, $params->get('ai_api_key', '')));
|
||||||
|
$componentKeyLength = mb_strlen($apiKey);
|
||||||
|
$model = trim((string) (is_array($storedParams)
|
||||||
|
? ($storedParams['ai_' . $provider . '_model'] ?? $params->get('ai_' . $provider . '_model', $defaultModels[$provider] ?? ''))
|
||||||
|
: $params->get('ai_' . $provider . '_model', $defaultModels[$provider] ?? '')));
|
||||||
|
if ($model === '') {
|
||||||
|
$model = $defaultModels[$provider] ?? '';
|
||||||
|
}
|
||||||
|
$storedApiKey = is_array($storedParams)
|
||||||
|
? trim((string) ($storedParams[$keyName] ?? $storedParams['ai_api_key'] ?? ''))
|
||||||
|
: '';
|
||||||
if ($storedApiKey !== '' && !preg_match('/^\*+$/', $storedApiKey)) {
|
if ($storedApiKey !== '' && !preg_match('/^\*+$/', $storedApiKey)) {
|
||||||
$apiKey = $storedApiKey;
|
$apiKey = $storedApiKey;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (trim($apiKey) === '') {
|
if (trim($apiKey) === '') {
|
||||||
$databaseKey = is_array($storedParams) ? trim((string) ($storedParams['ai_api_key'] ?? '')) : '';
|
$databaseKey = $storedApiKey;
|
||||||
$databaseKeyLength = preg_match('/^\*+$/', $databaseKey) ? 0 : mb_strlen($databaseKey);
|
$databaseKeyLength = preg_match('/^\*+$/', $databaseKey) ? 0 : mb_strlen($databaseKey);
|
||||||
throw new \RuntimeException(
|
throw new \RuntimeException(
|
||||||
'AI_KEY_EMPTY|provider=' . ($provider !== '' ? $provider : '(pusty)')
|
'AI_KEY_EMPTY|provider=' . ($provider !== '' ? $provider : '(pusty)')
|
||||||
@@ -135,6 +152,7 @@ class ResultModel extends BaseDatabaseModel
|
|||||||
$aiResult = (new AiService())->evaluate(
|
$aiResult = (new AiService())->evaluate(
|
||||||
$provider,
|
$provider,
|
||||||
$apiKey,
|
$apiKey,
|
||||||
|
$model,
|
||||||
strip_tags((string) $question->question),
|
strip_tags((string) $question->question),
|
||||||
(string) ($answer['selected'] ?? ''),
|
(string) ($answer['selected'] ?? ''),
|
||||||
(string) $question->answer_open,
|
(string) $question->answer_open,
|
||||||
@@ -142,6 +160,17 @@ class ResultModel extends BaseDatabaseModel
|
|||||||
);
|
);
|
||||||
$item->answers[$questionId]['ai_feedback'] = $aiResult['feedback'];
|
$item->answers[$questionId]['ai_feedback'] = $aiResult['feedback'];
|
||||||
$item->answers[$questionId]['awarded_points'] = $aiResult['awarded_points'];
|
$item->answers[$questionId]['awarded_points'] = $aiResult['awarded_points'];
|
||||||
|
if ($aiResult['usage'] !== null) {
|
||||||
|
$history = $item->answers[$questionId]['ai_usage_history'] ?? null;
|
||||||
|
if (!is_array($history)) {
|
||||||
|
$history = !empty($item->answers[$questionId]['ai_usage']) && is_array($item->answers[$questionId]['ai_usage'])
|
||||||
|
? [$item->answers[$questionId]['ai_usage']]
|
||||||
|
: [];
|
||||||
|
}
|
||||||
|
$history[] = $aiResult['usage'];
|
||||||
|
$item->answers[$questionId]['ai_usage_history'] = $history;
|
||||||
|
$item->answers[$questionId]['ai_usage'] = $aiResult['usage'];
|
||||||
|
}
|
||||||
|
|
||||||
$correctionPoints = 0;
|
$correctionPoints = 0;
|
||||||
foreach ($item->answers as $savedAnswer) {
|
foreach ($item->answers as $savedAnswer) {
|
||||||
|
|||||||
@@ -9,6 +9,107 @@ use Joomla\CMS\MVC\Model\ListModel;
|
|||||||
|
|
||||||
class ResultsModel extends 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;
|
||||||
|
$item->ai_tokens_by_provider = ['openai' => 0, 'grok' => 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);
|
||||||
|
$provider = (string) ($usage['provider'] ?? '');
|
||||||
|
if (isset($item->ai_tokens_by_provider[$provider])) {
|
||||||
|
$item->ai_tokens_by_provider[$provider] += (int) ($usage['total_tokens'] ?? 0);
|
||||||
|
}
|
||||||
|
if (is_numeric($usage['cost_usd'] ?? null)) {
|
||||||
|
$item->ai_cost_usd += (float) $usage['cost_usd'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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();
|
||||||
|
$emptyProviderTotals = ['input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0];
|
||||||
|
$totals = [
|
||||||
|
'input_tokens' => 0,
|
||||||
|
'output_tokens' => 0,
|
||||||
|
'total_tokens' => 0,
|
||||||
|
'cost_usd' => 0.0,
|
||||||
|
'providers' => ['openai' => $emptyProviderTotals, 'grok' => $emptyProviderTotals],
|
||||||
|
];
|
||||||
|
|
||||||
|
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'];
|
||||||
|
}
|
||||||
|
$provider = (string) ($usage['provider'] ?? '');
|
||||||
|
if (isset($totals['providers'][$provider])) {
|
||||||
|
$totals['providers'][$provider]['input_tokens'] += (int) ($usage['input_tokens'] ?? 0);
|
||||||
|
$totals['providers'][$provider]['output_tokens'] += (int) ($usage['output_tokens'] ?? 0);
|
||||||
|
$totals['providers'][$provider]['total_tokens'] += (int) ($usage['total_tokens'] ?? 0);
|
||||||
|
if (is_numeric($usage['cost_usd'] ?? null)) {
|
||||||
|
$totals['providers'][$provider]['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);
|
||||||
|
|||||||
@@ -9,6 +9,26 @@ use Joomla\CMS\MVC\Model\AdminModel;
|
|||||||
|
|
||||||
class SetModel extends AdminModel
|
class SetModel extends AdminModel
|
||||||
{
|
{
|
||||||
|
public function publish(&$pks, $value = 1)
|
||||||
|
{
|
||||||
|
$ids = array_values(array_unique(array_filter(array_map('intval', (array) $pks))));
|
||||||
|
if (!parent::publish($pks, $value)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($ids) {
|
||||||
|
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||||
|
$db->setQuery(
|
||||||
|
$db->getQuery(true)
|
||||||
|
->update($db->quoteName('#__testquestions_sets'))
|
||||||
|
->set($db->quoteName('published') . ' = ' . (int) $value)
|
||||||
|
->where($db->quoteName('parent_id') . ' IN (' . implode(',', $ids) . ')')
|
||||||
|
)->execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
public function getTable($name = 'Set', $prefix = 'Administrator', $config = [])
|
public function getTable($name = 'Set', $prefix = 'Administrator', $config = [])
|
||||||
{
|
{
|
||||||
return $this->getMVCFactory()->createTable($name, $prefix, $config);
|
return $this->getMVCFactory()->createTable($name, $prefix, $config);
|
||||||
@@ -136,6 +156,7 @@ class SetModel extends AdminModel
|
|||||||
$parent = $this->getItem($parentId);
|
$parent = $this->getItem($parentId);
|
||||||
if ($parent) {
|
if ($parent) {
|
||||||
$data['duration'] = (int) $parent->duration;
|
$data['duration'] = (int) $parent->duration;
|
||||||
|
$data['published'] = (int) $parent->published;
|
||||||
}
|
}
|
||||||
} elseif (!in_array(($data['set_type'] ?? 'ordinary'), ['ordinary', 'multi'], true)) {
|
} elseif (!in_array(($data['set_type'] ?? 'ordinary'), ['ordinary', 'multi'], true)) {
|
||||||
$data['set_type'] = 'ordinary';
|
$data['set_type'] = 'ordinary';
|
||||||
@@ -151,6 +172,15 @@ class SetModel extends AdminModel
|
|||||||
|
|
||||||
$setId = (int) $this->getState($this->getName() . '.id');
|
$setId = (int) $this->getState($this->getName() . '.id');
|
||||||
$db = Factory::getContainer()->get('DatabaseDriver');
|
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||||
|
if ($parentId === 0) {
|
||||||
|
$db->setQuery(
|
||||||
|
$db->getQuery(true)
|
||||||
|
->update($db->quoteName('#__testquestions_sets'))
|
||||||
|
->set($db->quoteName('published') . ' = ' . (int) ($data['published'] ?? 1))
|
||||||
|
->where($db->quoteName('parent_id') . ' = ' . $setId)
|
||||||
|
)->execute();
|
||||||
|
}
|
||||||
|
|
||||||
$db->setQuery(
|
$db->setQuery(
|
||||||
$db->getQuery(true)
|
$db->getQuery(true)
|
||||||
->delete($db->quoteName('#__testquestions_set_questions'))
|
->delete($db->quoteName('#__testquestions_set_questions'))
|
||||||
|
|||||||
@@ -8,13 +8,31 @@ use Joomla\CMS\Http\HttpFactory;
|
|||||||
|
|
||||||
class AiService
|
class AiService
|
||||||
{
|
{
|
||||||
public function evaluate(string $provider, string $apiKey, string $question, string $answer, string $pattern, int $maxPoints): array
|
public static function availableModels(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'openai' => [
|
||||||
|
'gpt-4.1-mini' => 'GPT-4.1 mini (starszy)',
|
||||||
|
'gpt-5.6-luna' => 'GPT-5.6 Luna',
|
||||||
|
'gpt-5.6-terra' => 'GPT-5.6 Terra',
|
||||||
|
'gpt-5.6-sol' => 'GPT-5.6 Sol',
|
||||||
|
'gpt-6-luna' => 'GPT-6 Luna',
|
||||||
|
],
|
||||||
|
'grok' => [
|
||||||
|
'grok-4.7' => 'Grok 4.7',
|
||||||
|
'grok-4.20' => 'Grok 4.20 Reasoning',
|
||||||
|
'grok-4.20-non-reasoning' => 'Grok 4.20 Non-Reasoning',
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function evaluate(string $provider, string $apiKey, string $model, string $question, string $answer, string $pattern, int $maxPoints): array
|
||||||
{
|
{
|
||||||
$provider = strtolower(trim($provider));
|
$provider = strtolower(trim($provider));
|
||||||
$provider = preg_replace('/[^a-z]/', '', $provider);
|
$provider = preg_replace('/[^a-z]/', '', $provider);
|
||||||
$config = $provider === 'grok'
|
$config = $provider === 'grok'
|
||||||
? ['url' => 'https://api.x.ai/v1/responses', 'model' => 'grok-4.7']
|
? ['url' => 'https://api.x.ai/v1/responses']
|
||||||
: ['url' => 'https://api.openai.com/v1/responses', 'model' => 'gpt-4.1-mini'];
|
: ['url' => 'https://api.openai.com/v1/responses'];
|
||||||
|
|
||||||
if (trim($apiKey) === '') {
|
if (trim($apiKey) === '') {
|
||||||
throw new \RuntimeException('AI_NOT_CONFIGURED');
|
throw new \RuntimeException('AI_NOT_CONFIGURED');
|
||||||
@@ -24,6 +42,10 @@ class AiService
|
|||||||
throw new \RuntimeException('Nieprawidłowy dostawca AI: ' . $provider);
|
throw new \RuntimeException('Nieprawidłowy dostawca AI: ' . $provider);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!isset(self::availableModels()[$provider][$model])) {
|
||||||
|
throw new \RuntimeException('Wybrany model AI nie jest obsługiwany.');
|
||||||
|
}
|
||||||
|
|
||||||
$input = "Oceń odpowiedź ucznia na pytanie otwarte i ustal liczbę uznanych punktów.\n"
|
$input = "Oceń odpowiedź ucznia na pytanie otwarte i ustal liczbę uznanych punktów.\n"
|
||||||
. "Maksymalna liczba punktów za to pytanie: " . max(0, $maxPoints) . ".\n"
|
. "Maksymalna liczba punktów za to pytanie: " . max(0, $maxPoints) . ".\n"
|
||||||
. "Przyznaj liczbę całkowitą od 0 do maksymalnej liczby punktów. Przyznaj punkty proporcjonalnie za poprawne elementy odpowiedzi; pełne punkty za komplet, część punktów za częściową odpowiedź. Nie przekraczaj limitu.\n\n"
|
. "Przyznaj liczbę całkowitą od 0 do maksymalnej liczby punktów. Przyznaj punkty proporcjonalnie za poprawne elementy odpowiedzi; pełne punkty za komplet, część punktów za częściową odpowiedź. Nie przekraczaj limitu.\n\n"
|
||||||
@@ -32,11 +54,15 @@ class AiService
|
|||||||
. "Odpowiedź ucznia:\n" . ($answer !== '' ? $answer : 'Brak odpowiedzi') . "\n\n"
|
. "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.";
|
. "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.";
|
||||||
|
|
||||||
$payload = json_encode([
|
$requestData = [
|
||||||
'model' => $config['model'],
|
'model' => $model,
|
||||||
'input' => $input,
|
'input' => $input,
|
||||||
'temperature' => 0.1,
|
];
|
||||||
], JSON_UNESCAPED_UNICODE);
|
// GPT-5.x reasoning models do not accept a custom temperature.
|
||||||
|
if ($provider === 'grok' || $model === 'gpt-4.1-mini') {
|
||||||
|
$requestData['temperature'] = 0.1;
|
||||||
|
}
|
||||||
|
$payload = json_encode($requestData, JSON_UNESCAPED_UNICODE);
|
||||||
|
|
||||||
$response = HttpFactory::getHttp()->post(
|
$response = HttpFactory::getHttp()->post(
|
||||||
$config['url'],
|
$config['url'],
|
||||||
@@ -73,9 +99,64 @@ class AiService
|
|||||||
throw new \RuntimeException('AI zwróciło nieprawidłowy format oceny i punktów.');
|
throw new \RuntimeException('AI zwróciło nieprawidłowy format oceny i punktów.');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$actualModel = (string) ($body['model'] ?? $model);
|
||||||
|
$usage = $this->getUsage($body, $provider, $model);
|
||||||
|
if ($usage !== null) {
|
||||||
|
$usage['model'] = $actualModel;
|
||||||
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'awarded_points' => min(max(0, $maxPoints), max(0, (int) $result['awarded_points'])),
|
'awarded_points' => min(max(0, $maxPoints), max(0, (int) $result['awarded_points'])),
|
||||||
'feedback' => trim((string) ($result['feedback'] ?? '')),
|
'feedback' => trim((string) ($result['feedback'] ?? '')),
|
||||||
|
'usage' => $usage,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
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'])) {
|
||||||
|
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)));
|
||||||
|
$cost = null;
|
||||||
|
$costSource = '';
|
||||||
|
|
||||||
|
if ($provider === 'grok' && isset($usage['cost_in_usd_ticks']) && is_numeric($usage['cost_in_usd_ticks'])) {
|
||||||
|
$cost = (float) $usage['cost_in_usd_ticks'] / 10000000000;
|
||||||
|
$costSource = 'provider';
|
||||||
|
} elseif ($provider === 'openai' && isset($this->openAiRates()[$model])) {
|
||||||
|
[$inputRate, $cachedRate, $outputRate, $cacheWriteRate] = $this->openAiRates()[$model];
|
||||||
|
$uncachedTokens = $inputTokens - $cachedTokens;
|
||||||
|
$cacheWriteTokens = min($uncachedTokens, max(0, (int) ($usage['input_tokens_details']['cache_write_tokens'] ?? 0)));
|
||||||
|
$uncachedTokens -= $cacheWriteTokens;
|
||||||
|
$cost = ($uncachedTokens * $inputRate + $cachedTokens * $cachedRate + $cacheWriteTokens * $cacheWriteRate + $outputTokens * $outputRate) / 1000000;
|
||||||
|
$costSource = 'token_rates';
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'provider' => $provider,
|
||||||
|
'model' => $model,
|
||||||
|
'input_tokens' => $inputTokens,
|
||||||
|
'output_tokens' => $outputTokens,
|
||||||
|
'total_tokens' => (int) ($usage['total_tokens'] ?? ($inputTokens + $outputTokens)),
|
||||||
|
'cached_input_tokens' => $cachedTokens,
|
||||||
|
'cost_usd' => $cost,
|
||||||
|
'cost_source' => $costSource,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function openAiRates(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'gpt-4.1-mini' => [0.40, 0.10, 1.60, 0.40],
|
||||||
|
'gpt-5.6-luna' => [0.20, 0.02, 1.20, 0.25],
|
||||||
|
'gpt-5.6-terra' => [2.00, 0.20, 12.00, 2.50],
|
||||||
|
'gpt-5.6-sol' => [4.00, 0.40, 20.00, 5.00],
|
||||||
|
'gpt-6-luna' => [0.10, 0.01, 0.50, 0.125],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ use Joomla\CMS\Toolbar\ToolbarHelper;
|
|||||||
class HtmlView extends BaseHtmlView
|
class HtmlView extends BaseHtmlView
|
||||||
{
|
{
|
||||||
protected array $settings = [];
|
protected array $settings = [];
|
||||||
|
protected array $usageTotals = [];
|
||||||
|
|
||||||
public function display($tpl = null)
|
public function display($tpl = null)
|
||||||
{
|
{
|
||||||
@@ -24,6 +25,54 @@ class HtmlView extends BaseHtmlView
|
|||||||
->where($db->quoteName('element') . ' = ' . $db->quote('com_testquestions'))
|
->where($db->quoteName('element') . ' = ' . $db->quote('com_testquestions'))
|
||||||
)->loadResult();
|
)->loadResult();
|
||||||
$this->settings = json_decode($raw, true) ?: [];
|
$this->settings = json_decode($raw, true) ?: [];
|
||||||
|
$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],
|
||||||
|
];
|
||||||
|
|
||||||
|
$usageRows = $db->setQuery(
|
||||||
|
$db->getQuery(true)
|
||||||
|
->select($db->quoteName('answers'))
|
||||||
|
->from($db->quoteName('#__testquestions_results'))
|
||||||
|
->where($db->quoteName('answers') . ' LIKE ' . $db->quote('%ai_usage%'))
|
||||||
|
)->loadColumn();
|
||||||
|
|
||||||
|
foreach ($usageRows 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;
|
||||||
|
}
|
||||||
|
$provider = (string) ($usage['provider'] ?? '');
|
||||||
|
if (!isset($this->usageTotals[$provider])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->usageTotals[$provider]['calls']++;
|
||||||
|
$this->usageTotals[$provider]['input_tokens'] += (int) ($usage['input_tokens'] ?? 0);
|
||||||
|
$this->usageTotals[$provider]['output_tokens'] += (int) ($usage['output_tokens'] ?? 0);
|
||||||
|
$this->usageTotals[$provider]['total_tokens'] += (int) ($usage['total_tokens'] ?? 0);
|
||||||
|
if (is_numeric($usage['cost_usd'] ?? null)) {
|
||||||
|
$this->usageTotals[$provider]['cost_usd'] += (float) $usage['cost_usd'];
|
||||||
|
$this->usageTotals[$provider]['cost_calls']++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_AI_SETTINGS'));
|
ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_AI_SETTINGS'));
|
||||||
ToolbarHelper::link('index.php?option=com_testquestions&view=questions', 'COM_TESTQUESTIONS_QUESTIONS', 'arrow-left');
|
ToolbarHelper::link('index.php?option=com_testquestions&view=questions', 'COM_TESTQUESTIONS_QUESTIONS', 'arrow-left');
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Komponent\Component\Testquestions\Administrator\View\Preview;
|
||||||
|
|
||||||
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
|
use Joomla\CMS\Factory;
|
||||||
|
use Joomla\CMS\Language\Text;
|
||||||
|
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
|
||||||
|
use Joomla\CMS\Router\Route;
|
||||||
|
use Joomla\CMS\Toolbar\ToolbarHelper;
|
||||||
|
|
||||||
|
class HtmlView extends BaseHtmlView
|
||||||
|
{
|
||||||
|
protected $items = [];
|
||||||
|
protected $set;
|
||||||
|
|
||||||
|
public function display($tpl = null)
|
||||||
|
{
|
||||||
|
$user = Factory::getApplication()->getIdentity();
|
||||||
|
if (!$user->authorise('core.edit', 'com_testquestions') && !$user->authorise('core.manage', 'com_testquestions')) {
|
||||||
|
throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->items = $this->get('Items');
|
||||||
|
$this->set = $this->get('Set');
|
||||||
|
$this->getDocument()->getWebAssetManager()->registerAndUseStyle(
|
||||||
|
'com_testquestions.exam',
|
||||||
|
'media/com_testquestions/egzamin.css'
|
||||||
|
);
|
||||||
|
ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_PREVIEW_TITLE'));
|
||||||
|
|
||||||
|
if ($this->set) {
|
||||||
|
ToolbarHelper::link(
|
||||||
|
Route::_('index.php?option=com_testquestions&view=sets'),
|
||||||
|
'COM_TESTQUESTIONS_SETS',
|
||||||
|
'arrow-left'
|
||||||
|
);
|
||||||
|
ToolbarHelper::link(
|
||||||
|
Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $this->set->id),
|
||||||
|
'COM_TESTQUESTIONS_EDIT_SET',
|
||||||
|
'edit'
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
ToolbarHelper::link(
|
||||||
|
Route::_('index.php?option=com_testquestions&view=questions'),
|
||||||
|
'COM_TESTQUESTIONS',
|
||||||
|
'arrow-left'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return parent::display($tpl);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -41,6 +41,7 @@ class HtmlView extends BaseHtmlView
|
|||||||
}
|
}
|
||||||
if ($user->authorise('core.edit', 'com_testquestions')) {
|
if ($user->authorise('core.edit', 'com_testquestions')) {
|
||||||
ToolbarHelper::editList('question.edit', 'JTOOLBAR_EDIT');
|
ToolbarHelper::editList('question.edit', 'JTOOLBAR_EDIT');
|
||||||
|
ToolbarHelper::custom('questions.preview', 'eye', 'eye', 'COM_TESTQUESTIONS_PREVIEW_SELECTED', true);
|
||||||
}
|
}
|
||||||
if ($user->authorise('core.delete', 'com_testquestions')) {
|
if ($user->authorise('core.delete', 'com_testquestions')) {
|
||||||
ToolbarHelper::deleteList('', 'questions.delete', 'JTOOLBAR_DELETE');
|
ToolbarHelper::deleteList('', 'questions.delete', 'JTOOLBAR_DELETE');
|
||||||
|
|||||||
@@ -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');
|
||||||
|
|
||||||
|
|||||||
@@ -47,6 +47,13 @@ class HtmlView extends BaseHtmlView
|
|||||||
protected function addToolbar()
|
protected function addToolbar()
|
||||||
{
|
{
|
||||||
ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SET') : Text::_('COM_TESTQUESTIONS_NEW_SET'));
|
ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SET') : Text::_('COM_TESTQUESTIONS_NEW_SET'));
|
||||||
|
if (!empty($this->item->id) && ((string) $this->item->set_type !== 'multi' || $this->isVariant)) {
|
||||||
|
ToolbarHelper::link(
|
||||||
|
'index.php?option=com_testquestions&view=preview&set_id=' . (int) $this->item->id,
|
||||||
|
'COM_TESTQUESTIONS_PREVIEW_SET',
|
||||||
|
'eye'
|
||||||
|
);
|
||||||
|
}
|
||||||
ToolbarHelper::custom('set.save', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE', false);
|
ToolbarHelper::custom('set.save', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE', false);
|
||||||
ToolbarHelper::custom('set.saveandclose', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE', false);
|
ToolbarHelper::custom('set.saveandclose', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE', false);
|
||||||
ToolbarHelper::cancel('set.cancel', 'JTOOLBAR_CANCEL');
|
ToolbarHelper::cancel('set.cancel', 'JTOOLBAR_CANCEL');
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ class HtmlView extends BaseHtmlView
|
|||||||
protected $pagination;
|
protected $pagination;
|
||||||
protected $state;
|
protected $state;
|
||||||
protected $subjects;
|
protected $subjects;
|
||||||
|
protected $canUnpublishAll = false;
|
||||||
|
|
||||||
public function display($tpl = null)
|
public function display($tpl = null)
|
||||||
{
|
{
|
||||||
@@ -22,6 +23,8 @@ 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->subjects = $this->get('Subjects');
|
$this->subjects = $this->get('Subjects');
|
||||||
|
$user = $this->getCurrentUser();
|
||||||
|
$this->canUnpublishAll = $user->authorise('core.edit.state', 'com_testquestions') || $user->authorise('core.edit', 'com_testquestions');
|
||||||
|
|
||||||
if (count($errors = $this->get('Errors'))) {
|
if (count($errors = $this->get('Errors'))) {
|
||||||
throw new \RuntimeException(implode("\n", $errors));
|
throw new \RuntimeException(implode("\n", $errors));
|
||||||
|
|||||||
@@ -1,8 +1,14 @@
|
|||||||
<?php defined('_JEXEC') or die; ?>
|
<?php defined('_JEXEC') or die; ?>
|
||||||
<?php use Joomla\CMS\HTML\HTMLHelper; ?>
|
<?php use Joomla\CMS\HTML\HTMLHelper; ?>
|
||||||
<?php use Joomla\CMS\Router\Route; ?>
|
<?php use Joomla\CMS\Router\Route; ?>
|
||||||
|
<?php $availableModels = \Komponent\Component\Testquestions\Administrator\Service\AiService::availableModels(); ?>
|
||||||
|
<?php $usageTotals = $this->usageTotals; ?>
|
||||||
<?php $provider = (string) ($this->settings['ai_provider'] ?? 'openai'); ?>
|
<?php $provider = (string) ($this->settings['ai_provider'] ?? 'openai'); ?>
|
||||||
<?php $apiKey = (string) ($this->settings['ai_api_key'] ?? ''); ?>
|
<?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 $openaiModel = (string) ($this->settings['ai_openai_model'] ?? 'gpt-4.1-mini'); ?>
|
||||||
|
<?php $grokModel = (string) ($this->settings['ai_grok_model'] ?? 'grok-4.7'); ?>
|
||||||
<form action="<?php echo Route::_('index.php?option=com_testquestions&view=ai'); ?>" method="post" name="adminForm" id="adminForm">
|
<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" style="max-width: 900px;">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
@@ -14,15 +20,72 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label for="ai-api-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_API_KEY'); ?></label>
|
<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) : ?>
|
||||||
|
<option value="<?php echo htmlspecialchars($modelId, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $openaiModel === $modelId ? 'selected' : ''; ?>><?php echo htmlspecialchars($modelLabel, ENT_QUOTES, 'UTF-8'); ?></option>
|
||||||
|
<?php endforeach; ?>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<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">
|
<div class="input-group">
|
||||||
<input type="password" id="ai-api-key" name="ai_api_key" value="<?php echo htmlspecialchars($apiKey, ENT_QUOTES, 'UTF-8'); ?>" class="form-control" size="120" maxlength="4096" autocomplete="new-password">
|
<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">
|
||||||
<button type="button" class="btn btn-outline-secondary" id="ai-key-toggle">Pokaż</button>
|
<button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="ai-openai-api-key">Pokaż</button>
|
||||||
</div>
|
</div>
|
||||||
<small class="form-text text-muted">
|
<small class="form-text text-muted">
|
||||||
<?php echo $apiKey !== '' ? 'Zapisany klucz: ' . mb_strlen($apiKey) . ' znaków. Pozostaw pole bez zmian, aby zachować klucz.' : 'Nie zapisano jeszcze klucza API.'; ?>
|
<?php echo $openaiKey !== '' ? 'Zapisany klucz: ' . mb_strlen($openaiKey) . ' znaków. Pozostaw pole bez zmian, aby go zachować.' : 'Nie zapisano klucza OpenAI.'; ?>
|
||||||
</small>
|
</small>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<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">
|
||||||
|
<button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="ai-grok-api-key">Pokaż</button>
|
||||||
|
</div>
|
||||||
|
<small class="form-text text-muted">
|
||||||
|
<?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">
|
||||||
|
<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) : ?>
|
||||||
|
<option value="<?php echo htmlspecialchars($modelId, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $grokModel === $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>
|
||||||
|
<div class="table-responsive">
|
||||||
|
<table class="table table-striped">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_PROVIDER'); ?></th>
|
||||||
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_CALLS'); ?></th>
|
||||||
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_INPUT'); ?></th>
|
||||||
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_OUTPUT'); ?></th>
|
||||||
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_TOTAL'); ?></th>
|
||||||
|
<th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_USAGE_COST'); ?></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<?php foreach (['openai' => 'OpenAI', 'grok' => 'Grok'] as $usageProvider => $usageProviderLabel) : ?>
|
||||||
|
<?php $providerUsage = $usageTotals[$usageProvider]; ?>
|
||||||
|
<tr>
|
||||||
|
<th><?php echo $usageProviderLabel; ?></th>
|
||||||
|
<td><?php echo number_format($providerUsage['calls'], 0, ',', ' '); ?></td>
|
||||||
|
<td><?php echo number_format($providerUsage['input_tokens'], 0, ',', ' '); ?></td>
|
||||||
|
<td><?php echo number_format($providerUsage['output_tokens'], 0, ',', ' '); ?></td>
|
||||||
|
<td><?php echo number_format($providerUsage['total_tokens'], 0, ',', ' '); ?></td>
|
||||||
|
<td><?php echo $providerUsage['cost_calls'] > 0 ? number_format($providerUsage['cost_usd'], 8, ',', ' ') . ' USD' : '—'; ?></td>
|
||||||
|
</tr>
|
||||||
|
<?php endforeach; ?>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<hr>
|
||||||
<button type="submit" class="btn btn-primary" onclick="this.form.task.value='ai.save';">
|
<button type="submit" class="btn btn-primary" onclick="this.form.task.value='ai.save';">
|
||||||
<?php echo \Joomla\CMS\Language\Text::_('JTOOLBAR_SAVE'); ?>
|
<?php echo \Joomla\CMS\Language\Text::_('JTOOLBAR_SAVE'); ?>
|
||||||
</button>
|
</button>
|
||||||
@@ -35,10 +98,12 @@
|
|||||||
<?php echo HTMLHelper::_('form.token'); ?>
|
<?php echo HTMLHelper::_('form.token'); ?>
|
||||||
</form>
|
</form>
|
||||||
<script>
|
<script>
|
||||||
document.getElementById('ai-key-toggle')?.addEventListener('click', function () {
|
document.querySelectorAll('[data-ai-key-toggle]').forEach(function (button) {
|
||||||
const input = document.getElementById('ai-api-key');
|
button.addEventListener('click', function () {
|
||||||
|
const input = document.getElementById(this.dataset.aiKeyToggle);
|
||||||
const visible = input.type === 'text';
|
const visible = input.type === 'text';
|
||||||
input.type = visible ? 'password' : 'text';
|
input.type = visible ? 'password' : 'text';
|
||||||
this.textContent = visible ? 'Pokaż' : 'Ukryj';
|
this.textContent = visible ? 'Pokaż' : 'Ukryj';
|
||||||
});
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
|
use Joomla\CMS\Router\Route;
|
||||||
|
use Joomla\CMS\Uri\Uri;
|
||||||
|
|
||||||
|
$resolveImageUrl = static function ($path) {
|
||||||
|
$path = trim((string) $path);
|
||||||
|
|
||||||
|
if ($path === '' || preg_match('#^https?://#i', $path)) {
|
||||||
|
return $path;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Uri::root() . ltrim($path, '/');
|
||||||
|
};
|
||||||
|
?>
|
||||||
|
<div class="com-testquestions egzamin">
|
||||||
|
<p class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_PREVIEW_READONLY'); ?></p>
|
||||||
|
<?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->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) : ?>
|
||||||
|
<div class="alert alert-warning"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_PREVIEW_EMPTY'); ?></div>
|
||||||
|
<?php else : ?>
|
||||||
|
<?php foreach ($this->items as $number => $item) : ?>
|
||||||
|
<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>
|
||||||
|
<?php if ($item->image) : ?>
|
||||||
|
<div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($item->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div>
|
||||||
|
<?php endif; ?>
|
||||||
|
<?php if ($item->question_type === 'open') : ?>
|
||||||
|
<div class="odp">
|
||||||
|
<strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_PATTERN'); ?>:</strong>
|
||||||
|
<?php echo htmlspecialchars((string) $item->answer_open, ENT_QUOTES, 'UTF-8'); ?>
|
||||||
|
</div>
|
||||||
|
<?php else : ?>
|
||||||
|
<ol type="A" class="answer-list">
|
||||||
|
<?php foreach (['answer_a', 'answer_b', 'answer_c', 'answer_d'] as $answerIndex => $answerField) : ?>
|
||||||
|
<?php $isCorrect = (int) $item->correct_answer === $answerIndex + 1; ?>
|
||||||
|
<li class="<?php echo $isCorrect ? 'odpp' : 'odp'; ?>">
|
||||||
|
<label>
|
||||||
|
<input type="radio" disabled <?php echo $isCorrect ? 'checked' : ''; ?>>
|
||||||
|
<strong><?php echo chr(65 + $answerIndex); ?>.</strong>
|
||||||
|
<span class="answer-text"><?php echo $item->$answerField; ?></span>
|
||||||
|
<?php if ($isCorrect) : ?><span class="text-success ms-1" title="<?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_ANSWER'); ?>">✓</span><?php endif; ?>
|
||||||
|
</label>
|
||||||
|
</li>
|
||||||
|
<?php endforeach; ?>
|
||||||
|
</ol>
|
||||||
|
<?php endif; ?>
|
||||||
|
</article>
|
||||||
|
<?php endforeach; ?>
|
||||||
|
<?php endif; ?>
|
||||||
|
<a class="btn btn-secondary" href="<?php echo $this->set ? Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $this->set->id) : Route::_('index.php?option=com_testquestions&view=questions'); ?>">
|
||||||
|
<?php echo $this->set ? \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_EDIT_SET') : \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_PREVIEW_BACK'); ?>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
@@ -35,6 +35,25 @@
|
|||||||
<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';">
|
<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); ?>
|
<?php echo \Joomla\CMS\Language\Text::sprintf('COM_TESTQUESTIONS_AI_EVALUATE_ALL', $pendingAiCount); ?>
|
||||||
</button>
|
</button>
|
||||||
|
<?php
|
||||||
|
$usageTotals = ['input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.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 (!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 echo number_format($usageTotals['total_tokens'], 0, ',', ' '); ?> tokenów,
|
||||||
|
<?php echo number_format($usageTotals['cost_usd'], 8, ',', ' '); ?> USD
|
||||||
|
</span>
|
||||||
|
<?php endif; ?>
|
||||||
</div>
|
</div>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<h2><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_ANSWERS'); ?></h2>
|
<h2><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_ANSWERS'); ?></h2>
|
||||||
@@ -55,11 +74,23 @@
|
|||||||
<button type="submit" name="ai_question_id" value="<?php echo (int) $questionId; ?>" onclick="this.form.task.value='result.ai';" formaction="<?php echo Route::_('index.php?option=com_testquestions&task=result.ai&id=' . (int) $this->item->id); ?>" class="btn btn-outline-primary">
|
<button type="submit" name="ai_question_id" value="<?php echo (int) $questionId; ?>" onclick="this.form.task.value='result.ai';" formaction="<?php echo Route::_('index.php?option=com_testquestions&task=result.ai&id=' . (int) $this->item->id); ?>" class="btn btn-outline-primary">
|
||||||
<?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_EVALUATE'); ?>
|
<?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_EVALUATE'); ?>
|
||||||
</button>
|
</button>
|
||||||
|
<?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'; ?> ·
|
||||||
|
<?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'; ?>
|
||||||
|
<?php echo ($usage['cost_source'] ?? '') === 'token_rates' ? ' (wyliczony)' : ''; ?>
|
||||||
|
</span>
|
||||||
|
<?php endif; ?>
|
||||||
</div>
|
</div>
|
||||||
<?php if (!empty($answer['ai_feedback'])) : ?>
|
<?php if (!empty($answer['ai_feedback'])) : ?>
|
||||||
<div class="alert alert-info 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 alert-info 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>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
<?php if ($question->question_type === 'open') : ?>
|
||||||
<div class="row mt-3">
|
<div class="row mt-3">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label for="awarded-points-<?php echo (int) $questionId; ?>" class="form-label"><?php echo \Joomla\CMS\Language\Text::sprintf('COM_TESTQUESTIONS_RESULT_AWARDED_POINTS', (int) ($question->points ?? 0)); ?></label>
|
<label for="awarded-points-<?php echo (int) $questionId; ?>" class="form-label"><?php echo \Joomla\CMS\Language\Text::sprintf('COM_TESTQUESTIONS_RESULT_AWARDED_POINTS', (int) ($question->points ?? 0)); ?></label>
|
||||||
@@ -71,6 +102,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
<?php endif; ?>
|
||||||
</article>
|
</article>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
<input type="hidden" name="task" value="result.save">
|
<input type="hidden" name="task" value="result.save">
|
||||||
|
|||||||
@@ -33,6 +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 $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_AI_TOKENS_TOTAL')); ?>:</strong>
|
||||||
|
<span class="d-block">
|
||||||
|
<strong>OpenAI:</strong>
|
||||||
|
<?php echo number_format((int) $this->aiUsageTotals['providers']['openai']['total_tokens'], 0, ',', ' '); ?> tokenów
|
||||||
|
(<?php echo number_format((int) $this->aiUsageTotals['providers']['openai']['input_tokens'], 0, ',', ' '); ?> wej. /
|
||||||
|
<?php echo number_format((int) $this->aiUsageTotals['providers']['openai']['output_tokens'], 0, ',', ' '); ?> wyj.)
|
||||||
|
<?php if ($this->aiUsageTotals['providers']['openai']['cost_usd'] > 0) : ?> · <?php echo number_format((float) $this->aiUsageTotals['providers']['openai']['cost_usd'], 8, ',', ' '); ?> USD<?php endif; ?>
|
||||||
|
</span>
|
||||||
|
<span class="d-block">
|
||||||
|
<strong>Grok:</strong>
|
||||||
|
<?php echo number_format((int) $this->aiUsageTotals['providers']['grok']['total_tokens'], 0, ',', ' '); ?> tokenów
|
||||||
|
(<?php echo number_format((int) $this->aiUsageTotals['providers']['grok']['input_tokens'], 0, ',', ' '); ?> wej. /
|
||||||
|
<?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>Łącznie:</strong> <?php echo number_format((int) $this->aiUsageTotals['total_tokens'], 0, ',', ' '); ?> tokenów</span>
|
||||||
|
</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>
|
||||||
@@ -41,6 +59,7 @@ use Joomla\CMS\Router\Route;
|
|||||||
<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) : ?>
|
||||||
@@ -58,6 +77,20 @@ use Joomla\CMS\Router\Route;
|
|||||||
<td><?php echo $this->escape($grade); ?></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 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 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, ',', ' '); ?>
|
||||||
|
</small>
|
||||||
|
<small class="d-block text-muted">
|
||||||
|
<?php echo number_format((int) $item->ai_total_tokens, 0, ',', ' '); ?> łącznie
|
||||||
|
<?php if ($item->ai_cost_usd > 0) : ?> · <?php echo number_format((float) $item->ai_cost_usd, 8, ',', ' '); ?> USD<?php endif; ?>
|
||||||
|
</small>
|
||||||
|
<?php else : ?>
|
||||||
|
—
|
||||||
|
<?php endif; ?>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -28,7 +28,11 @@ HTMLHelper::_('behavior.formvalidator');
|
|||||||
<?php echo $this->form->renderField('test_content'); ?>
|
<?php echo $this->form->renderField('test_content'); ?>
|
||||||
<?php echo $this->form->renderField('image'); ?>
|
<?php echo $this->form->renderField('image'); ?>
|
||||||
<?php echo $this->form->renderField('description'); ?>
|
<?php echo $this->form->renderField('description'); ?>
|
||||||
|
<?php if ($this->isVariant) : ?>
|
||||||
|
<div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANT_STATUS_INHERITED'); ?></div>
|
||||||
|
<?php else : ?>
|
||||||
<?php echo $this->form->renderField('published'); ?>
|
<?php echo $this->form->renderField('published'); ?>
|
||||||
|
<?php endif; ?>
|
||||||
<?php if ((int) $this->item->id > 0 && (string) $this->item->set_type === 'multi') : ?>
|
<?php if ((int) $this->item->id > 0 && (string) $this->item->set_type === 'multi') : ?>
|
||||||
<fieldset class="mb-3">
|
<fieldset class="mb-3">
|
||||||
<legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANTS'); ?></legend>
|
<legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANTS'); ?></legend>
|
||||||
@@ -36,8 +40,13 @@ HTMLHelper::_('behavior.formvalidator');
|
|||||||
<ul class="list-group mb-3">
|
<ul class="list-group mb-3">
|
||||||
<?php foreach ($this->variants as $variant) : ?>
|
<?php foreach ($this->variants as $variant) : ?>
|
||||||
<li class="list-group-item d-flex justify-content-between align-items-center">
|
<li class="list-group-item d-flex justify-content-between align-items-center">
|
||||||
|
<span>
|
||||||
<a href="<?php echo Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $variant->id); ?>"><?php echo $this->escape($variant->title); ?></a>
|
<a href="<?php echo Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $variant->id); ?>"><?php echo $this->escape($variant->title); ?></a>
|
||||||
<span class="badge <?php echo (int) $variant->published ? 'bg-success' : 'bg-secondary'; ?>"><?php echo (int) $variant->published ? \Joomla\CMS\Language\Text::_('JPUBLISHED') : \Joomla\CMS\Language\Text::_('JUNPUBLISHED'); ?></span>
|
<span class="badge <?php echo (int) $variant->published ? 'bg-success' : 'bg-secondary'; ?>"><?php echo (int) $variant->published ? \Joomla\CMS\Language\Text::_('JPUBLISHED') : \Joomla\CMS\Language\Text::_('JUNPUBLISHED'); ?></span>
|
||||||
|
</span>
|
||||||
|
<a class="btn btn-sm btn-outline-secondary" href="<?php echo Route::_('index.php?option=com_testquestions&view=preview&set_id=' . (int) $variant->id); ?>">
|
||||||
|
<?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_PREVIEW_SET'); ?>
|
||||||
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</ul>
|
</ul>
|
||||||
@@ -93,10 +102,14 @@ HTMLHelper::_('behavior.formvalidator');
|
|||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label for="set-question-ids" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_ID_FILTER'); ?></label>
|
||||||
|
<input type="text" id="set-question-ids" class="form-control" placeholder="<?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_ID_FILTER_HINT')); ?>" inputmode="numeric">
|
||||||
|
</div>
|
||||||
<div id="set-available-question-list" class="border rounded p-3">
|
<div id="set-available-question-list" class="border rounded p-3">
|
||||||
<?php foreach ($this->questions as $question) : ?>
|
<?php foreach ($this->questions as $question) : ?>
|
||||||
<?php if (in_array((int) $question->id, array_map('intval', (array) $this->item->question_ids), true)) continue; ?>
|
<?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; ?>">
|
<div class="form-check set-available-question-row" data-category="<?php echo (int) $question->category_id; ?>" data-id="<?php echo (int) $question->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; ?>">
|
<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; ?>">
|
<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>
|
<span class="badge bg-secondary"><?php echo $this->escape($question->category_title ?: \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_UNCATEGORIZED')); ?></span>
|
||||||
@@ -172,17 +185,28 @@ document.addEventListener('DOMContentLoaded', function () {
|
|||||||
<script>
|
<script>
|
||||||
document.addEventListener('DOMContentLoaded', function () {
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
const filter = document.getElementById('set-question-category');
|
const filter = document.getElementById('set-question-category');
|
||||||
|
const idFilter = document.getElementById('set-question-ids');
|
||||||
const rows = document.querySelectorAll('.set-available-question-row');
|
const rows = document.querySelectorAll('.set-available-question-row');
|
||||||
|
|
||||||
if (!filter) {
|
if (!filter || !idFilter) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
filter.addEventListener('change', function () {
|
const applyFilters = function () {
|
||||||
|
const requestedIds = idFilter.value
|
||||||
|
.split(',')
|
||||||
|
.map(function (value) { return value.trim(); })
|
||||||
|
.filter(function (value) { return value !== ''; });
|
||||||
|
|
||||||
rows.forEach(function (row) {
|
rows.forEach(function (row) {
|
||||||
row.classList.toggle('d-none', filter.value !== '' && row.dataset.category !== filter.value);
|
const matchesCategory = filter.value === '' || row.dataset.category === filter.value;
|
||||||
});
|
const matchesId = requestedIds.length === 0 || requestedIds.includes(row.dataset.id);
|
||||||
|
row.classList.toggle('d-none', !matchesCategory || !matchesId);
|
||||||
});
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
filter.addEventListener('change', applyFilters);
|
||||||
|
idFilter.addEventListener('input', applyFilters);
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
@@ -30,6 +30,11 @@ HTMLHelper::_('behavior.multiselect');
|
|||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button>
|
<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>
|
<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>
|
||||||
|
<?php if ($this->canUnpublishAll) : ?>
|
||||||
|
<button type="submit" class="btn btn-warning" data-confirm="<?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL_CONFIRM')); ?>" onclick="if (!confirm(this.dataset.confirm)) { return false; } this.form.task.value='sets.unpublishall';">
|
||||||
|
<?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL'); ?>
|
||||||
|
</button>
|
||||||
|
<?php endif; ?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -49,7 +54,12 @@ HTMLHelper::_('behavior.multiselect');
|
|||||||
<?php foreach ($this->items as $i => $item) : ?>
|
<?php foreach ($this->items as $i => $item) : ?>
|
||||||
<tr>
|
<tr>
|
||||||
<td><?php echo HTMLHelper::_('grid.id', $i, $item->id); ?></td>
|
<td><?php echo HTMLHelper::_('grid.id', $i, $item->id); ?></td>
|
||||||
<th scope="row"><a href="<?php echo Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $item->id); ?>"><?php echo (int) $item->parent_id > 0 ? '↳ ' : ''; ?><?php echo $this->escape($item->title); ?></a><?php if ((int) $item->parent_id > 0 && $item->parent_title) : ?> <small class="text-muted">(<?php echo $this->escape($item->parent_title); ?>)</small><?php endif; ?></th>
|
<th scope="row">
|
||||||
|
<a href="<?php echo Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $item->id); ?>"><?php echo (int) $item->parent_id > 0 ? '↳ ' : ''; ?><?php echo $this->escape($item->title); ?></a><?php if ((int) $item->parent_id > 0 && $item->parent_title) : ?> <small class="text-muted">(<?php echo $this->escape($item->parent_title); ?>)</small><?php endif; ?>
|
||||||
|
<?php if ($item->set_type === 'ordinary') : ?>
|
||||||
|
<a class="btn btn-sm btn-outline-secondary ms-2" href="<?php echo Route::_('index.php?option=com_testquestions&view=preview&set_id=' . (int) $item->id); ?>"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_PREVIEW_SET'); ?></a>
|
||||||
|
<?php endif; ?>
|
||||||
|
</th>
|
||||||
<td><?php echo $this->escape($item->set_type === 'multi' ? \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TYPE_MULTI') : ($item->set_type === 'variant' ? \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TYPE_VARIANT') : \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TYPE_ORDINARY'))); ?></td>
|
<td><?php echo $this->escape($item->set_type === 'multi' ? \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TYPE_MULTI') : ($item->set_type === 'variant' ? \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TYPE_VARIANT') : \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TYPE_ORDINARY'))); ?></td>
|
||||||
<td><?php echo $this->escape($item->subject_title ?: '—'); ?></td>
|
<td><?php echo $this->escape($item->subject_title ?: '—'); ?></td>
|
||||||
<td><?php echo (int) $item->question_count; ?></td>
|
<td><?php echo (int) $item->question_count; ?></td>
|
||||||
|
|||||||
@@ -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.1</version>
|
<version>1.43.18</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>
|
||||||
|
|||||||
@@ -3,6 +3,17 @@
|
|||||||
defined('_JEXEC') or die;
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
use Joomla\CMS\HTML\HTMLHelper;
|
use Joomla\CMS\HTML\HTMLHelper;
|
||||||
|
use Joomla\CMS\Uri\Uri;
|
||||||
|
|
||||||
|
$resolveImageUrl = static function ($path) {
|
||||||
|
$path = trim((string) $path);
|
||||||
|
|
||||||
|
if ($path === '' || preg_match('#^https?://#i', $path)) {
|
||||||
|
return $path;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Uri::root() . ltrim($path, '/');
|
||||||
|
};
|
||||||
?>
|
?>
|
||||||
<div class="com-testquestions egzamin">
|
<div class="com-testquestions egzamin">
|
||||||
<h1><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS'); ?></h1>
|
<h1><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS'); ?></h1>
|
||||||
@@ -43,7 +54,7 @@ use Joomla\CMS\HTML\HTMLHelper;
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<?php if ($item->image) : ?>
|
<?php if ($item->image) : ?>
|
||||||
<div class="foto_pyt"><img src="<?php echo htmlspecialchars($item->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div>
|
<div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($item->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<?php if ($item->question_type === 'open') : ?>
|
<?php if ($item->question_type === 'open') : ?>
|
||||||
<div class="<?php echo $this->results ? ($this->results['items'][$item->id]['correct'] ? 'odpup' : 'odpu') : 'odp'; ?>">
|
<div class="<?php echo $this->results ? ($this->results['items'][$item->id]['correct'] ? 'odpup' : 'odpu') : 'odp'; ?>">
|
||||||
|
|||||||
@@ -3,6 +3,17 @@
|
|||||||
defined('_JEXEC') or die;
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
use Joomla\CMS\Factory;
|
use Joomla\CMS\Factory;
|
||||||
|
use Joomla\CMS\Uri\Uri;
|
||||||
|
|
||||||
|
$resolveImageUrl = static function ($path) {
|
||||||
|
$path = trim((string) $path);
|
||||||
|
|
||||||
|
if ($path === '' || preg_match('#^https?://#i', $path)) {
|
||||||
|
return $path;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Uri::root() . ltrim($path, '/');
|
||||||
|
};
|
||||||
?>
|
?>
|
||||||
<div class="com-testquestions egzamin">
|
<div class="com-testquestions egzamin">
|
||||||
<?php if (!$this->started) : ?>
|
<?php if (!$this->started) : ?>
|
||||||
@@ -44,7 +55,7 @@ use Joomla\CMS\Factory;
|
|||||||
<h1><?php echo htmlspecialchars($this->set->title, ENT_QUOTES, 'UTF-8'); ?></h1>
|
<h1><?php echo htmlspecialchars($this->set->title, ENT_QUOTES, 'UTF-8'); ?></h1>
|
||||||
<?php $extraTime = Factory::getApplication()->getInput()->post->getInt('extra_time', 0); ?>
|
<?php $extraTime = Factory::getApplication()->getInput()->post->getInt('extra_time', 0); ?>
|
||||||
<?php if ((int) $this->set->duration > 0) : ?><div class="small text-muted"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_DURATION'); ?>: <?php echo (int) $this->set->duration + $extraTime; ?> min</div><?php endif; ?>
|
<?php if ((int) $this->set->duration > 0) : ?><div class="small text-muted"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_DURATION'); ?>: <?php echo (int) $this->set->duration + $extraTime; ?> min</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->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->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) : ?>
|
<?php if (!$this->results && ((int) $this->set->duration + $extraTime) > 0) : ?>
|
||||||
@@ -64,7 +75,7 @@ use Joomla\CMS\Factory;
|
|||||||
<?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>
|
||||||
<?php if ($item->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($item->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
|
<?php if ($item->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($item->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
|
||||||
<?php if ($item->question_type === 'open') : ?>
|
<?php if ($item->question_type === 'open') : ?>
|
||||||
<div class="<?php echo $this->results ? ($this->results['items'][$item->id]['correct'] ? 'odpup' : 'odpu') : 'odp'; ?>">
|
<div class="<?php echo $this->results ? ($this->results['items'][$item->id]['correct'] ? 'odpup' : 'odpu') : 'odp'; ?>">
|
||||||
<?php if ($this->results) : ?>
|
<?php if ($this->results) : ?>
|
||||||
|
|||||||
Reference in New Issue
Block a user