Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
37d8c6040c | ||
|
|
7ed00f95e6 | ||
|
|
57065d4ca1 | ||
|
|
7d9efd64f4 | ||
|
|
6daca5be59 | ||
|
|
dc6b5ad3e8 | ||
|
|
aa12305e65 | ||
|
|
af98d0d1d4 | ||
|
|
acfdf21488 | ||
|
|
3efb937469 | ||
|
|
bb1dc728d1 | ||
|
|
ed2c6b663b | ||
|
|
03728ce49f | ||
|
|
a7637aedcc | ||
|
|
7f4f86080a | ||
|
|
9e940c5710 | ||
|
|
62befb825e | ||
|
|
804c8f5467 | ||
|
|
53dd9658e8 | ||
|
|
5e12e8838d | ||
|
|
96e8a4a0f5 | ||
|
|
3ee0b22d75 | ||
|
|
59335cbc52 | ||
|
|
5abf29cebb | ||
|
|
defdfcb32f | ||
|
|
0f1bd3e9fe | ||
|
|
8abee59a49 |
@@ -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.35.0).
|
||||
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.7).
|
||||
|
||||
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<config>
|
||||
<fields name="params">
|
||||
<fieldset name="basic" label="COM_TESTQUESTIONS_AI_SETTINGS">
|
||||
<field name="ai_provider" type="list" label="COM_TESTQUESTIONS_AI_PROVIDER">
|
||||
<option value="openai">OpenAI</option>
|
||||
<option value="grok">Grok</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>
|
||||
</fields>
|
||||
</config>
|
||||
@@ -57,6 +57,43 @@ COM_TESTQUESTIONS_SET_VARIANTS="Warianty zestawu"
|
||||
COM_TESTQUESTIONS_SET_ADD_VARIANT="Dodaj wariant"
|
||||
COM_TESTQUESTIONS_SET_PARENT="Zestaw nadrzędny"
|
||||
COM_TESTQUESTIONS_SET_NO_VARIANTS="Brak wariantów"
|
||||
COM_TESTQUESTIONS_SET_MULTI_QUESTIONS_INFO="Pytania są dodawane w poszczególnych wariantach zestawu."
|
||||
COM_TESTQUESTIONS_SET_REORDER_INFO="Przeciągnij pytania, aby zmienić ich kolejność."
|
||||
COM_TESTQUESTIONS_SET_SAVE="Zapisz"
|
||||
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_AI_SETTINGS="Ustawienia AI"
|
||||
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_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_BALANCE="Saldo kont API"
|
||||
COM_TESTQUESTIONS_AI_OPENAI_BALANCE_INFO="OpenAI nie udostępnia salda przedpłaconych środków przez zwykłe API. Saldo sprawdzisz w panelu rozliczeń: "
|
||||
COM_TESTQUESTIONS_AI_OPENAI_BILLING_LINK="Otwórz rozliczenia OpenAI"
|
||||
COM_TESTQUESTIONS_AI_GROK_TEAM_ID="ID zespołu xAI"
|
||||
COM_TESTQUESTIONS_AI_GROK_MANAGEMENT_KEY="Klucz zarządzający xAI"
|
||||
COM_TESTQUESTIONS_AI_GROK_MANAGEMENT_KEY_SAVED="Klucz zarządzający jest zapisany. Pozostaw pole bez zmian, aby go zachować."
|
||||
COM_TESTQUESTIONS_AI_GROK_MANAGEMENT_KEY_INFO="Wymagany jest osobny Management API key z xAI Console → Settings → Management Keys."
|
||||
COM_TESTQUESTIONS_AI_CHECK_GROK_BALANCE="Sprawdź saldo xAI"
|
||||
COM_TESTQUESTIONS_AI_GROK_BALANCE_INFO="Odczyt dotyczy dostępnych kredytów przedpłaconych zespołu xAI. Nie obejmuje limitu rozliczeń postpaid."
|
||||
COM_TESTQUESTIONS_AI_GROK_BALANCE_CONFIG_REQUIRED="Aby sprawdzić saldo xAI, wpisz ID zespołu i klucz zarządzający, a następnie ponów próbę."
|
||||
COM_TESTQUESTIONS_AI_GROK_BALANCE_FAILED="Nie udało się odczytać salda xAI. Sprawdź ID zespołu, klucz zarządzający i jego uprawnienia."
|
||||
COM_TESTQUESTIONS_AI_GROK_BALANCE_RESULT="Dostępne kredyty przedpłacone xAI: $%s USD"
|
||||
COM_TESTQUESTIONS_AI_SETTINGS_MENU="Konfiguracja AI"
|
||||
COM_TESTQUESTIONS_AI_SETTINGS_SAVED="Ustawienia AI zapisano."
|
||||
COM_TESTQUESTIONS_AI_SAVE_FAILED="Nie udało się zapisać ustawień AI."
|
||||
COM_TESTQUESTIONS_AI_PROVIDER_INVALID="Wybierz prawidłowego dostawcę AI."
|
||||
COM_TESTQUESTIONS_AI_EVALUATE_ALL="AI — oceń wszystkie niezaliczone pytania otwarte (%s)"
|
||||
COM_TESTQUESTIONS_AI_BULK_DONE="AI oceniło %s pytań."
|
||||
COM_TESTQUESTIONS_AI_BULK_PARTIAL="AI oceniło %s pytań; nie udało się ocenić %s. Błąd: %s"
|
||||
COM_TESTQUESTIONS_AI_NO_OPEN_QUESTIONS="Brak niezaliczonych pytań otwartych do oceny AI."
|
||||
COM_TESTQUESTIONS_AI_EVALUATE="AI"
|
||||
COM_TESTQUESTIONS_AI_RESULT="Ocena AI"
|
||||
COM_TESTQUESTIONS_AI_NOT_CONFIGURED="Skonfiguruj dostawcę i klucz API w ustawieniach komponentu."
|
||||
COM_TESTQUESTIONS_AI_ERROR="Nie udało się uzyskać odpowiedzi AI: %s"
|
||||
COM_TESTQUESTIONS_SET_DESCRIPTION="Opis zestawu"
|
||||
COM_TESTQUESTIONS_SET_QUESTIONS="Pytania w zestawie"
|
||||
COM_TESTQUESTIONS_SET_QUESTION_COUNT="Liczba pytań"
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.36.0.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.37.0.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.37.1.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.37.2.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.37.3.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.38.0.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.39.0.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.40.0.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.41.0.
|
||||
@@ -0,0 +1 @@
|
||||
-- AI feedback is stored in the existing answers JSON column.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.42.1.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.42.2.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.42.3.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.42.4.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.42.5.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.42.6.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.42.7.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.42.8.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.42.9.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.43.0.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.43.1.
|
||||
@@ -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,160 @@
|
||||
<?php
|
||||
|
||||
namespace Komponent\Component\Testquestions\Administrator\Controller;
|
||||
|
||||
defined('_JEXEC') or die;
|
||||
|
||||
use Joomla\CMS\Factory;
|
||||
use Joomla\CMS\Http\HttpFactory;
|
||||
use Joomla\CMS\Language\Text;
|
||||
use Joomla\CMS\MVC\Controller\BaseController;
|
||||
use Joomla\CMS\Router\Route;
|
||||
use Joomla\CMS\Session\Session;
|
||||
use Komponent\Component\Testquestions\Administrator\Service\AiService;
|
||||
|
||||
class AiController extends BaseController
|
||||
{
|
||||
public function save(): void
|
||||
{
|
||||
$this->saveSettings();
|
||||
|
||||
$this->setRedirect(
|
||||
Route::_('index.php?option=com_testquestions&view=ai', false),
|
||||
Text::_('COM_TESTQUESTIONS_AI_SETTINGS_SAVED')
|
||||
);
|
||||
}
|
||||
|
||||
public function checkbalance(): void
|
||||
{
|
||||
$settings = $this->saveSettings();
|
||||
$teamId = trim((string) ($settings['ai_grok_team_id'] ?? ''));
|
||||
$managementKey = trim((string) ($settings['ai_grok_management_key'] ?? ''));
|
||||
|
||||
if ($teamId === '' || $managementKey === '') {
|
||||
$this->setRedirect(
|
||||
Route::_('index.php?option=com_testquestions&view=ai', false),
|
||||
Text::_('COM_TESTQUESTIONS_AI_GROK_BALANCE_CONFIG_REQUIRED'),
|
||||
'warning'
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
$response = HttpFactory::getHttp()->get(
|
||||
'https://management-api.x.ai/v1/billing/teams/' . rawurlencode($teamId) . '/prepaid/balance',
|
||||
['Authorization' => 'Bearer ' . $managementKey, 'Accept' => 'application/json'],
|
||||
30
|
||||
);
|
||||
} catch (\Throwable $error) {
|
||||
$this->setRedirect(
|
||||
Route::_('index.php?option=com_testquestions&view=ai', false),
|
||||
Text::_('COM_TESTQUESTIONS_AI_GROK_BALANCE_FAILED'),
|
||||
'error'
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
$body = json_decode((string) $response->body, true);
|
||||
if ((int) $response->code < 200 || (int) $response->code >= 300 || !isset($body['total']['val']) || !is_numeric($body['total']['val'])) {
|
||||
$this->setRedirect(
|
||||
Route::_('index.php?option=com_testquestions&view=ai', false),
|
||||
Text::_('COM_TESTQUESTIONS_AI_GROK_BALANCE_FAILED'),
|
||||
'error'
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
$balance = abs((float) $body['total']['val']) / 100;
|
||||
$message = Text::sprintf('COM_TESTQUESTIONS_AI_GROK_BALANCE_RESULT', number_format($balance, 2, ',', ' '));
|
||||
$this->setRedirect(
|
||||
Route::_('index.php?option=com_testquestions&view=ai', false),
|
||||
$message,
|
||||
'message'
|
||||
);
|
||||
}
|
||||
|
||||
private function saveSettings(): array
|
||||
{
|
||||
if (!Session::checkToken()) {
|
||||
throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
|
||||
}
|
||||
|
||||
$user = Factory::getApplication()->getIdentity();
|
||||
if (!$user->authorise('core.admin', 'com_testquestions') && !$user->authorise('core.options', 'com_testquestions')) {
|
||||
throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
|
||||
}
|
||||
|
||||
$input = Factory::getApplication()->getInput();
|
||||
$provider = strtolower($input->post->getCmd('ai_provider', ''));
|
||||
if (!in_array($provider, ['openai', 'grok'], 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', '');
|
||||
if (!isset($models[$modelProvider][$model])) {
|
||||
throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_MODEL_INVALID'));
|
||||
}
|
||||
$selectedModels[$modelProvider] = $model;
|
||||
}
|
||||
|
||||
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||
$row = $db->setQuery(
|
||||
$db->getQuery(true)
|
||||
->select([$db->quoteName('extension_id'), $db->quoteName('params')])
|
||||
->from($db->quoteName('#__extensions'))
|
||||
->where($db->quoteName('type') . ' = ' . $db->quote('component'))
|
||||
->where($db->quoteName('element') . ' = ' . $db->quote('com_testquestions'))
|
||||
)->loadObject();
|
||||
|
||||
if (!$row) {
|
||||
throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_SAVE_FAILED'));
|
||||
}
|
||||
|
||||
$settings = json_decode((string) $row->params, true);
|
||||
$settings = is_array($settings) ? $settings : [];
|
||||
$legacyKey = trim((string) ($settings['ai_api_key'] ?? ''));
|
||||
$settings['ai_provider'] = $provider;
|
||||
foreach ($selectedModels as $modelProvider => $model) {
|
||||
$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;
|
||||
}
|
||||
}
|
||||
|
||||
$teamId = trim((string) $input->post->get('ai_grok_team_id', '', 'STRING'));
|
||||
if ($teamId !== '') {
|
||||
$settings['ai_grok_team_id'] = $teamId;
|
||||
}
|
||||
$managementKey = trim((string) $input->post->get('ai_grok_management_key', '', 'RAW'));
|
||||
if ($managementKey !== '') {
|
||||
$settings['ai_grok_management_key'] = $managementKey;
|
||||
}
|
||||
unset($settings['ai_api_key']);
|
||||
|
||||
$extension = (object) [
|
||||
'extension_id' => (int) $row->extension_id,
|
||||
'params' => json_encode($settings, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
|
||||
];
|
||||
if (!$db->updateObject('#__extensions', $extension, 'extension_id')) {
|
||||
throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_SAVE_FAILED'));
|
||||
}
|
||||
|
||||
return $settings;
|
||||
}
|
||||
|
||||
public function cancel(): void
|
||||
{
|
||||
$this->setRedirect(Route::_('index.php?option=com_testquestions&view=questions', false));
|
||||
}
|
||||
}
|
||||
@@ -32,6 +32,78 @@ class ResultController extends BaseController
|
||||
);
|
||||
}
|
||||
|
||||
public function ai(): void
|
||||
{
|
||||
if (!Session::checkToken()) {
|
||||
throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
|
||||
}
|
||||
|
||||
$input = Factory::getApplication()->getInput();
|
||||
$id = $input->post->getInt('id');
|
||||
$questionId = $input->post->getInt('ai_question_id');
|
||||
$message = Text::_('COM_TESTQUESTIONS_AI_RESULT');
|
||||
$type = 'message';
|
||||
|
||||
try {
|
||||
$this->getModel('Result')->evaluateWithAi($id, $questionId);
|
||||
} catch (\Throwable $error) {
|
||||
$errorMessage = $error->getMessage();
|
||||
$message = str_starts_with($errorMessage, 'AI_KEY_EMPTY|')
|
||||
? 'Diagnostyka konfiguracji AI (1.42.8): ' . substr($errorMessage, strlen('AI_KEY_EMPTY|'))
|
||||
: ($errorMessage === 'AI_NOT_CONFIGURED'
|
||||
? Text::_('COM_TESTQUESTIONS_AI_NOT_CONFIGURED')
|
||||
: Text::sprintf('COM_TESTQUESTIONS_AI_ERROR', $errorMessage));
|
||||
$type = 'error';
|
||||
}
|
||||
|
||||
$this->setRedirect(
|
||||
Route::_('index.php?option=com_testquestions&view=result&id=' . $id, false),
|
||||
$message,
|
||||
$type
|
||||
);
|
||||
}
|
||||
|
||||
public function aiAll(): void
|
||||
{
|
||||
if (!Session::checkToken()) {
|
||||
throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
|
||||
}
|
||||
|
||||
$input = Factory::getApplication()->getInput();
|
||||
$id = $input->post->getInt('id');
|
||||
$message = '';
|
||||
$type = 'message';
|
||||
|
||||
try {
|
||||
$summary = $this->getModel('Result')->evaluateAllWithAi($id);
|
||||
if ($summary['failed'] > 0) {
|
||||
$message = Text::sprintf(
|
||||
'COM_TESTQUESTIONS_AI_BULK_PARTIAL',
|
||||
$summary['evaluated'],
|
||||
$summary['failed'],
|
||||
$summary['first_error']
|
||||
);
|
||||
$type = 'warning';
|
||||
} else {
|
||||
$message = Text::sprintf('COM_TESTQUESTIONS_AI_BULK_DONE', $summary['evaluated']);
|
||||
}
|
||||
} catch (\Throwable $error) {
|
||||
$errorMessage = $error->getMessage();
|
||||
$message = $errorMessage === 'AI_NO_OPEN_QUESTIONS'
|
||||
? Text::_('COM_TESTQUESTIONS_AI_NO_OPEN_QUESTIONS')
|
||||
: ($errorMessage === 'AI_NOT_CONFIGURED'
|
||||
? Text::_('COM_TESTQUESTIONS_AI_NOT_CONFIGURED')
|
||||
: Text::sprintf('COM_TESTQUESTIONS_AI_ERROR', $errorMessage));
|
||||
$type = 'error';
|
||||
}
|
||||
|
||||
$this->setRedirect(
|
||||
Route::_('index.php?option=com_testquestions&view=result&id=' . $id, false),
|
||||
$message,
|
||||
$type
|
||||
);
|
||||
}
|
||||
|
||||
private function saveAssessment(): void
|
||||
{
|
||||
if (!Session::checkToken()) {
|
||||
|
||||
@@ -17,8 +17,83 @@ class SetController extends FormController
|
||||
$this->setRedirect('index.php?option=com_testquestions&view=set&layout=edit&parent_id=' . $parentId);
|
||||
}
|
||||
|
||||
public function save2close($key = null, $urlVar = null)
|
||||
{
|
||||
$formData = (array) $this->input->post->get('jform', [], 'array');
|
||||
$parentId = (int) ($formData['parent_id'] ?? 0);
|
||||
$itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
|
||||
$result = parent::save2close($key, $urlVar);
|
||||
|
||||
if ($result) {
|
||||
if ($itemId > 0) {
|
||||
$item = $this->getModel()->getItem($itemId);
|
||||
$parentId = (int) ($item->parent_id ?? $parentId);
|
||||
}
|
||||
|
||||
if ($parentId > 0) {
|
||||
$this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $parentId);
|
||||
}
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function save($key = null, $urlVar = null)
|
||||
{
|
||||
$formData = (array) $this->input->post->get('jform', [], 'array');
|
||||
$result = parent::save($key, $urlVar);
|
||||
$itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
|
||||
|
||||
if ($result && $itemId > 0) {
|
||||
$this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $itemId);
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function saveandclose($key = null, $urlVar = null)
|
||||
{
|
||||
$formData = (array) $this->input->post->get('jform', [], 'array');
|
||||
$parentId = (int) ($formData['parent_id'] ?? 0);
|
||||
$result = parent::save($key, $urlVar);
|
||||
$itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
|
||||
|
||||
if ($result && $itemId > 0 && $parentId < 1) {
|
||||
$item = $this->getModel()->getItem($itemId);
|
||||
$parentId = (int) ($item->parent_id ?? 0);
|
||||
}
|
||||
|
||||
if ($result) {
|
||||
$this->setRedirect(
|
||||
$parentId > 0
|
||||
? 'index.php?option=com_testquestions&task=set.edit&id=' . $parentId
|
||||
: 'index.php?option=com_testquestions&view=sets'
|
||||
);
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function cancel($key = null)
|
||||
{
|
||||
$parentId = $this->input->getInt('parent_id');
|
||||
$formData = (array) $this->input->post->get('jform', [], 'array');
|
||||
$parentId = (int) ($formData['parent_id'] ?? $parentId);
|
||||
|
||||
if ($parentId < 1) {
|
||||
$itemId = $this->input->getInt('id');
|
||||
if ($itemId > 0) {
|
||||
$item = $this->getModel()->getItem($itemId);
|
||||
$parentId = (int) ($item->parent_id ?? 0);
|
||||
}
|
||||
}
|
||||
|
||||
if ($parentId > 0) {
|
||||
$this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $parentId);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
$this->setRedirect('index.php?option=com_testquestions&view=sets');
|
||||
|
||||
return true;
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
|
||||
namespace Komponent\Component\Testquestions\Administrator\Field;
|
||||
|
||||
defined('_JEXEC') or die;
|
||||
|
||||
use Joomla\CMS\Form\Field\PasswordField;
|
||||
|
||||
class AiapikeyField extends PasswordField
|
||||
{
|
||||
protected $type = 'Aiapikey';
|
||||
|
||||
protected function getInput(): string
|
||||
{
|
||||
$id = htmlspecialchars($this->id, ENT_QUOTES, 'UTF-8');
|
||||
$length = mb_strlen((string) $this->value);
|
||||
|
||||
return '<div class="input-group">'
|
||||
. parent::getInput()
|
||||
. '<button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="' . $id . '">Pokaż</button>'
|
||||
. '</div>'
|
||||
. '<small class="form-text text-muted">Klucz: ' . (int) $length . ' znaków.</small>'
|
||||
. '<script>
|
||||
document.addEventListener("click", function (event) {
|
||||
var button = event.target.closest("[data-ai-key-toggle]");
|
||||
if (!button) return;
|
||||
var input = document.getElementById(button.getAttribute("data-ai-key-toggle"));
|
||||
if (!input) return;
|
||||
var visible = input.type === "text";
|
||||
input.type = visible ? "password" : "text";
|
||||
button.textContent = visible ? "Pokaż" : "Ukryj";
|
||||
});
|
||||
</script>';
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,8 @@ defined('_JEXEC') or die;
|
||||
|
||||
use Joomla\CMS\Factory;
|
||||
use Joomla\CMS\MVC\Model\BaseDatabaseModel;
|
||||
use Joomla\CMS\Component\ComponentHelper;
|
||||
use Komponent\Component\Testquestions\Administrator\Service\AiService;
|
||||
|
||||
class ResultModel extends BaseDatabaseModel
|
||||
{
|
||||
@@ -72,4 +74,159 @@ class ResultModel extends BaseDatabaseModel
|
||||
|
||||
return (bool) $db->updateObject('#__testquestions_results', $row, 'id');
|
||||
}
|
||||
|
||||
public function evaluateWithAi(int $id, int $questionId): string
|
||||
{
|
||||
$item = $this->getItem($id);
|
||||
|
||||
if (!$item) {
|
||||
throw new \RuntimeException('Nie znaleziono zapisanego testu.');
|
||||
}
|
||||
|
||||
$answer = $item->answers[$questionId] ?? null;
|
||||
$question = $item->questions[$questionId] ?? null;
|
||||
|
||||
if (!$item || !$answer || !$question || $question->question_type !== 'open' || !empty($answer['correct'])) {
|
||||
throw new \RuntimeException('Nieprawidłowe pytanie do oceny AI.');
|
||||
}
|
||||
|
||||
$params = ComponentHelper::getParams('com_testquestions');
|
||||
$provider = trim((string) $params->get('ai_provider', 'openai'));
|
||||
$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);
|
||||
$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
|
||||
// nieaktualnej wartości z pamięci ComponentHelper, a maska pola hasła
|
||||
// (np. ********) nie zostanie potraktowana jako prawdziwy klucz.
|
||||
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||
$storedParams = (string) $db->setQuery(
|
||||
$db->getQuery(true)
|
||||
->select($db->quoteName('params'))
|
||||
->from($db->quoteName('#__extensions'))
|
||||
->where($db->quoteName('type') . ' = ' . $db->quote('component'))
|
||||
->where($db->quoteName('element') . ' = ' . $db->quote('com_testquestions'))
|
||||
)->loadResult();
|
||||
$storedParams = json_decode($storedParams, true);
|
||||
|
||||
if (is_array($storedParams)) {
|
||||
$storedProvider = trim((string) ($storedParams['ai_provider'] ?? ''));
|
||||
$storedApiKey = trim((string) ($storedParams['ai_api_key'] ?? ''));
|
||||
|
||||
if ($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)) {
|
||||
$apiKey = $storedApiKey;
|
||||
}
|
||||
|
||||
if (trim($apiKey) === '') {
|
||||
$databaseKey = $storedApiKey;
|
||||
$databaseKeyLength = preg_match('/^\*+$/', $databaseKey) ? 0 : mb_strlen($databaseKey);
|
||||
throw new \RuntimeException(
|
||||
'AI_KEY_EMPTY|provider=' . ($provider !== '' ? $provider : '(pusty)')
|
||||
. '|component_chars=' . $componentKeyLength
|
||||
. '|database_chars=' . $databaseKeyLength
|
||||
. '|database_params=' . (is_array($storedParams) ? 'json' : 'unreadable')
|
||||
);
|
||||
}
|
||||
|
||||
$aiResult = (new AiService())->evaluate(
|
||||
$provider,
|
||||
$apiKey,
|
||||
$model,
|
||||
strip_tags((string) $question->question),
|
||||
(string) ($answer['selected'] ?? ''),
|
||||
(string) $question->answer_open,
|
||||
(int) $question->points
|
||||
);
|
||||
$item->answers[$questionId]['ai_feedback'] = $aiResult['feedback'];
|
||||
$item->answers[$questionId]['awarded_points'] = $aiResult['awarded_points'];
|
||||
if ($aiResult['usage'] !== null) {
|
||||
$item->answers[$questionId]['ai_usage'] = $aiResult['usage'];
|
||||
}
|
||||
|
||||
$correctionPoints = 0;
|
||||
foreach ($item->answers as $savedAnswer) {
|
||||
$correctionPoints += (int) ($savedAnswer['awarded_points'] ?? 0);
|
||||
}
|
||||
|
||||
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||
$row = (object) [
|
||||
'id' => $id,
|
||||
'answers' => json_encode($item->answers, JSON_UNESCAPED_UNICODE),
|
||||
'points_after' => (int) $item->points_before + $correctionPoints,
|
||||
];
|
||||
|
||||
if (!$db->updateObject('#__testquestions_results', $row, 'id')) {
|
||||
throw new \RuntimeException('Nie udało się zapisać oceny AI.');
|
||||
}
|
||||
|
||||
return $aiResult['feedback'];
|
||||
}
|
||||
|
||||
public function evaluateAllWithAi(int $id): array
|
||||
{
|
||||
$item = $this->getItem($id);
|
||||
|
||||
if (!$item) {
|
||||
throw new \RuntimeException('Nie znaleziono zapisanego testu.');
|
||||
}
|
||||
|
||||
$questionIds = [];
|
||||
foreach ($item->answers as $questionId => $answer) {
|
||||
$question = $item->questions[(int) $questionId] ?? null;
|
||||
if ($question && $question->question_type === 'open' && empty($answer['correct'])) {
|
||||
$questionIds[] = (int) $questionId;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$questionIds) {
|
||||
throw new \RuntimeException('AI_NO_OPEN_QUESTIONS');
|
||||
}
|
||||
|
||||
$evaluated = 0;
|
||||
$failed = 0;
|
||||
$firstError = '';
|
||||
|
||||
foreach ($questionIds as $questionId) {
|
||||
try {
|
||||
$this->evaluateWithAi($id, $questionId);
|
||||
$evaluated++;
|
||||
} catch (\Throwable $error) {
|
||||
$failed++;
|
||||
$firstError = $firstError ?: $error->getMessage();
|
||||
|
||||
if (in_array($error->getMessage(), ['AI_NOT_CONFIGURED'], true)
|
||||
|| str_starts_with($error->getMessage(), 'AI_KEY_EMPTY|')) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return [
|
||||
'evaluated' => $evaluated,
|
||||
'failed' => $failed,
|
||||
'first_error' => $firstError,
|
||||
'total' => count($questionIds),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -133,10 +133,18 @@ class SetModel extends AdminModel
|
||||
|
||||
if ($parentId > 0) {
|
||||
$data['set_type'] = 'variant';
|
||||
$parent = $this->getItem($parentId);
|
||||
if ($parent) {
|
||||
$data['duration'] = (int) $parent->duration;
|
||||
}
|
||||
} elseif (!in_array(($data['set_type'] ?? 'ordinary'), ['ordinary', 'multi'], true)) {
|
||||
$data['set_type'] = 'ordinary';
|
||||
}
|
||||
|
||||
if ($parentId === 0 && ($data['set_type'] ?? 'ordinary') === 'multi') {
|
||||
$questionIds = [];
|
||||
}
|
||||
|
||||
if (!parent::save($data)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,180 @@
|
||||
<?php
|
||||
|
||||
namespace Komponent\Component\Testquestions\Administrator\Service;
|
||||
|
||||
defined('_JEXEC') or die;
|
||||
|
||||
use Joomla\CMS\Http\HttpFactory;
|
||||
|
||||
class AiService
|
||||
{
|
||||
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 = preg_replace('/[^a-z]/', '', $provider);
|
||||
$config = $provider === 'grok'
|
||||
? ['url' => 'https://api.x.ai/v1/responses']
|
||||
: ['url' => 'https://api.openai.com/v1/responses'];
|
||||
|
||||
if (trim($apiKey) === '') {
|
||||
throw new \RuntimeException('AI_NOT_CONFIGURED');
|
||||
}
|
||||
|
||||
if (!in_array($provider, ['openai', 'grok'], true)) {
|
||||
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"
|
||||
. "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"
|
||||
. "Pytanie:\n" . $question . "\n\n"
|
||||
. "Wzorzec odpowiedzi:\n" . $pattern . "\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.";
|
||||
|
||||
$requestData = [
|
||||
'model' => $model,
|
||||
'input' => $input,
|
||||
];
|
||||
// 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(
|
||||
$config['url'],
|
||||
$payload,
|
||||
[
|
||||
'Authorization' => 'Bearer ' . trim($apiKey),
|
||||
'Content-Type' => 'application/json',
|
||||
],
|
||||
60
|
||||
);
|
||||
$body = json_decode((string) $response->body, true);
|
||||
|
||||
if ((int) $response->code < 200 || (int) $response->code >= 300) {
|
||||
throw new \RuntimeException((string) ($body['error']['message'] ?? ('HTTP ' . (int) $response->code)));
|
||||
}
|
||||
|
||||
$text = $this->extractText($body);
|
||||
if ($text === '') {
|
||||
throw new \RuntimeException('Brak treści odpowiedzi AI.');
|
||||
}
|
||||
|
||||
$jsonText = preg_replace('/^```(?:json)?\s*|\s*```$/i', '', trim($text));
|
||||
$result = json_decode($jsonText, true);
|
||||
|
||||
if (!is_array($result) || !isset($result['awarded_points']) || !is_numeric($result['awarded_points'])) {
|
||||
$start = strpos($jsonText, '{');
|
||||
$end = strrpos($jsonText, '}');
|
||||
if ($start !== false && $end !== false && $end > $start) {
|
||||
$result = json_decode(substr($jsonText, $start, $end - $start + 1), true);
|
||||
}
|
||||
}
|
||||
|
||||
if (!is_array($result) || !isset($result['awarded_points']) || !is_numeric($result['awarded_points'])) {
|
||||
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 [
|
||||
'awarded_points' => min(max(0, $maxPoints), max(0, (int) $result['awarded_points'])),
|
||||
'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],
|
||||
];
|
||||
}
|
||||
|
||||
private function extractText(array $body): string
|
||||
{
|
||||
if (!empty($body['output_text']) && is_string($body['output_text'])) {
|
||||
return trim($body['output_text']);
|
||||
}
|
||||
|
||||
$parts = [];
|
||||
foreach ((array) ($body['output'] ?? []) as $output) {
|
||||
foreach ((array) ($output['content'] ?? []) as $content) {
|
||||
if (!empty($content['text']) && is_string($content['text'])) {
|
||||
$parts[] = $content['text'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return trim(implode("\n", $parts));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
<?php
|
||||
|
||||
namespace Komponent\Component\Testquestions\Administrator\View\Ai;
|
||||
|
||||
defined('_JEXEC') or die;
|
||||
|
||||
use Joomla\CMS\Factory;
|
||||
use Joomla\CMS\Language\Text;
|
||||
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
|
||||
use Joomla\CMS\Toolbar\ToolbarHelper;
|
||||
|
||||
class HtmlView extends BaseHtmlView
|
||||
{
|
||||
protected array $settings = [];
|
||||
|
||||
public function display($tpl = null)
|
||||
{
|
||||
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||
$raw = (string) $db->setQuery(
|
||||
$db->getQuery(true)
|
||||
->select($db->quoteName('params'))
|
||||
->from($db->quoteName('#__extensions'))
|
||||
->where($db->quoteName('type') . ' = ' . $db->quote('component'))
|
||||
->where($db->quoteName('element') . ' = ' . $db->quote('com_testquestions'))
|
||||
)->loadResult();
|
||||
$this->settings = json_decode($raw, true) ?: [];
|
||||
|
||||
ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_AI_SETTINGS'));
|
||||
ToolbarHelper::link('index.php?option=com_testquestions&view=questions', 'COM_TESTQUESTIONS_QUESTIONS', 'arrow-left');
|
||||
|
||||
return parent::display($tpl);
|
||||
}
|
||||
}
|
||||
@@ -63,5 +63,11 @@ class HtmlView extends BaseHtmlView
|
||||
'COM_TESTQUESTIONS_RESULTS',
|
||||
'list'
|
||||
);
|
||||
|
||||
ToolbarHelper::link(
|
||||
'index.php?option=com_testquestions&view=ai',
|
||||
'COM_TESTQUESTIONS_AI_SETTINGS_MENU',
|
||||
'cog'
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ namespace Komponent\Component\Testquestions\Administrator\View\Set;
|
||||
|
||||
defined('_JEXEC') or die;
|
||||
|
||||
use Joomla\CMS\Factory;
|
||||
use Joomla\CMS\Language\Text;
|
||||
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
|
||||
use Joomla\CMS\Toolbar\ToolbarHelper;
|
||||
@@ -15,6 +16,8 @@ class HtmlView extends BaseHtmlView
|
||||
protected $questions;
|
||||
protected $categories;
|
||||
protected $variants;
|
||||
protected $isVariant;
|
||||
protected $parentTitle = '';
|
||||
|
||||
public function display($tpl = null)
|
||||
{
|
||||
@@ -23,6 +26,14 @@ class HtmlView extends BaseHtmlView
|
||||
$this->questions = $this->get('Questions');
|
||||
$this->categories = $this->get('Categories');
|
||||
$this->variants = $this->item && (int) $this->item->id > 0 ? $this->get('Variants') : [];
|
||||
$parentId = Factory::getApplication()->getInput()->getInt('parent_id');
|
||||
$this->isVariant = (int) ($this->item->parent_id ?? 0) > 0 || $parentId > 0;
|
||||
$this->parentTitle = (string) ($this->item->parent_title ?? '');
|
||||
|
||||
if ($this->isVariant && $this->parentTitle === '' && $parentId > 0) {
|
||||
$parent = $this->getModel()->getItem($parentId);
|
||||
$this->parentTitle = (string) ($parent->title ?? '');
|
||||
}
|
||||
|
||||
if (count($errors = $this->get('Errors'))) {
|
||||
throw new \RuntimeException(implode("\n", $errors));
|
||||
@@ -36,8 +47,8 @@ class HtmlView extends BaseHtmlView
|
||||
protected function addToolbar()
|
||||
{
|
||||
ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SET') : Text::_('COM_TESTQUESTIONS_NEW_SET'));
|
||||
ToolbarHelper::apply('set.apply', 'JTOOLBAR_APPLY');
|
||||
ToolbarHelper::save('set.save', 'JTOOLBAR_SAVE');
|
||||
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::cancel('set.cancel', 'JTOOLBAR_CANCEL');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
<?php defined('_JEXEC') or die; ?>
|
||||
<?php use Joomla\CMS\HTML\HTMLHelper; ?>
|
||||
<?php use Joomla\CMS\Router\Route; ?>
|
||||
<?php $availableModels = \Komponent\Component\Testquestions\Administrator\Service\AiService::availableModels(); ?>
|
||||
<?php $provider = (string) ($this->settings['ai_provider'] ?? 'openai'); ?>
|
||||
<?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">
|
||||
<div class="card" style="max-width: 900px;">
|
||||
<div class="card-body">
|
||||
<div class="mb-3">
|
||||
<label for="ai-provider" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_PROVIDER'); ?></label>
|
||||
<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>
|
||||
</select>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<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">
|
||||
<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" data-ai-key-toggle="ai-openai-api-key">Pokaż</button>
|
||||
</div>
|
||||
<small class="form-text text-muted">
|
||||
<?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">
|
||||
<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_BALANCE'); ?></h3>
|
||||
<div class="alert alert-info">
|
||||
<?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_OPENAI_BALANCE_INFO'); ?>
|
||||
<a href="https://platform.openai.com/settings/organization/billing/overview" target="_blank" rel="noopener noreferrer"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_OPENAI_BILLING_LINK'); ?></a>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="ai-grok-team-id" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROK_TEAM_ID'); ?></label>
|
||||
<input type="text" id="ai-grok-team-id" name="ai_grok_team_id" class="form-control" maxlength="255" value="<?php echo htmlspecialchars((string) ($this->settings['ai_grok_team_id'] ?? ''), ENT_QUOTES, 'UTF-8'); ?>">
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="ai-grok-management-key" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROK_MANAGEMENT_KEY'); ?></label>
|
||||
<div class="input-group">
|
||||
<input type="password" id="ai-grok-management-key" name="ai_grok_management_key" value="<?php echo htmlspecialchars((string) ($this->settings['ai_grok_management_key'] ?? ''), ENT_QUOTES, 'UTF-8'); ?>" class="form-control" maxlength="4096" autocomplete="new-password">
|
||||
<button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="ai-grok-management-key">Pokaż</button>
|
||||
</div>
|
||||
<small class="form-text text-muted">
|
||||
<?php echo !empty($this->settings['ai_grok_management_key']) ? \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROK_MANAGEMENT_KEY_SAVED') : \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROK_MANAGEMENT_KEY_INFO'); ?>
|
||||
</small>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-outline-primary" onclick="this.form.task.value='ai.checkbalance';">
|
||||
<?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_CHECK_GROK_BALANCE'); ?>
|
||||
</button>
|
||||
<div class="form-text mt-2"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_GROK_BALANCE_INFO'); ?></div>
|
||||
<hr>
|
||||
<button type="submit" class="btn btn-primary" onclick="this.form.task.value='ai.save';">
|
||||
<?php echo \Joomla\CMS\Language\Text::_('JTOOLBAR_SAVE'); ?>
|
||||
</button>
|
||||
<a class="btn btn-secondary" href="<?php echo Route::_('index.php?option=com_testquestions&view=questions'); ?>">
|
||||
<?php echo \Joomla\CMS\Language\Text::_('JCANCEL'); ?>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<input type="hidden" name="task" value="ai.save">
|
||||
<?php echo HTMLHelper::_('form.token'); ?>
|
||||
</form>
|
||||
<script>
|
||||
document.querySelectorAll('[data-ai-key-toggle]').forEach(function (button) {
|
||||
button.addEventListener('click', function () {
|
||||
const input = document.getElementById(this.dataset.aiKeyToggle);
|
||||
const visible = input.type === 'text';
|
||||
input.type = visible ? 'password' : 'text';
|
||||
this.textContent = visible ? 'Pokaż' : 'Ukryj';
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@@ -25,6 +25,37 @@
|
||||
<dd class="col-sm-9"><?php echo floor((int) $this->item->execution_time / 60); ?>:<?php echo str_pad((string) ((int) $this->item->execution_time % 60), 2, '0', STR_PAD_LEFT); ?></dd>
|
||||
</dl>
|
||||
<form action="<?php echo Route::_('index.php?option=com_testquestions&view=result&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm">
|
||||
<?php $pendingAiCount = 0; ?>
|
||||
<?php foreach ($this->item->answers as $questionId => $answer) : ?>
|
||||
<?php $candidate = $this->item->questions[(int) $questionId] ?? null; ?>
|
||||
<?php if ($candidate && $candidate->question_type === 'open' && empty($answer['correct'])) { $pendingAiCount++; } ?>
|
||||
<?php endforeach; ?>
|
||||
<?php if ($pendingAiCount > 0) : ?>
|
||||
<div class="mb-3">
|
||||
<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' => []];
|
||||
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>
|
||||
<?php endif; ?>
|
||||
<h2><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_ANSWERS'); ?></h2>
|
||||
<?php foreach ($this->item->answers as $questionId => $answer) : ?>
|
||||
<?php $question = $this->item->questions[(int) $questionId] ?? null; if (!$question) continue; ?>
|
||||
@@ -38,16 +69,39 @@
|
||||
<?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>
|
||||
<?php if (empty($answer['correct'])) : ?>
|
||||
<div class="row mt-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>
|
||||
<input type="number" min="0" max="<?php echo (int) ($question->points ?? 0); ?>" name="awarded_points[<?php echo (int) $questionId; ?>]" id="awarded-points-<?php echo (int) $questionId; ?>" class="form-control" value="<?php echo (int) ($answer['awarded_points'] ?? 0); ?>">
|
||||
<?php if ($question->question_type === 'open') : ?>
|
||||
<div class="mt-3">
|
||||
<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'); ?>
|
||||
</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 class="col-md-9">
|
||||
<label for="result-comment-<?php echo (int) $questionId; ?>" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_COMMENT'); ?></label>
|
||||
<textarea name="comments[<?php echo (int) $questionId; ?>]" id="result-comment-<?php echo (int) $questionId; ?>" class="form-control" rows="2"><?php echo htmlspecialchars((string) ($answer['comment'] ?? ''), ENT_QUOTES, 'UTF-8'); ?></textarea>
|
||||
<?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>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
<?php if ($question->question_type === 'open') : ?>
|
||||
<div class="row mt-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>
|
||||
<input type="number" min="0" max="<?php echo (int) ($question->points ?? 0); ?>" name="awarded_points[<?php echo (int) $questionId; ?>]" id="awarded-points-<?php echo (int) $questionId; ?>" class="form-control" value="<?php echo (int) ($answer['awarded_points'] ?? 0); ?>">
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
<label for="result-comment-<?php echo (int) $questionId; ?>" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_COMMENT'); ?></label>
|
||||
<textarea name="comments[<?php echo (int) $questionId; ?>]" id="result-comment-<?php echo (int) $questionId; ?>" class="form-control" rows="2"><?php echo htmlspecialchars((string) ($answer['comment'] ?? ''), ENT_QUOTES, 'UTF-8'); ?></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
</article>
|
||||
<?php endforeach; ?>
|
||||
|
||||
@@ -8,18 +8,23 @@ use Joomla\CMS\Router\Route;
|
||||
HTMLHelper::_('behavior.formvalidator');
|
||||
?>
|
||||
<form action="<?php echo Route::_('index.php?option=com_testquestions&view=set&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate">
|
||||
<?php $canOrderQuestions = $this->isVariant || (string) $this->item->set_type === 'ordinary'; ?>
|
||||
<fieldset class="adminform">
|
||||
<?php echo $this->form->renderField('parent_id'); ?>
|
||||
<?php if ((int) $this->item->parent_id > 0) : ?>
|
||||
<div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_PARENT'); ?>: <?php echo $this->escape($this->item->parent_title ?? ''); ?></div>
|
||||
<?php if ($this->isVariant) : ?>
|
||||
<div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_PARENT'); ?>: <?php echo $this->escape($this->parentTitle); ?></div>
|
||||
<input type="hidden" name="jform[set_type]" value="variant">
|
||||
<?php else : ?>
|
||||
<?php echo $this->form->renderField('set_type'); ?>
|
||||
<?php endif; ?>
|
||||
<?php echo $this->form->renderField('title'); ?>
|
||||
<?php echo $this->form->renderField('subject_id'); ?>
|
||||
<?php echo $this->form->renderField('duration'); ?>
|
||||
<output id="set-duration-value" class="form-text mb-3"></output>
|
||||
<?php if (!$this->isVariant) : ?>
|
||||
<?php echo $this->form->renderField('duration'); ?>
|
||||
<output id="set-duration-value" class="form-text mb-3"></output>
|
||||
<?php else : ?>
|
||||
<div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANT_DURATION_INFO'); ?></div>
|
||||
<?php endif; ?>
|
||||
<?php echo $this->form->renderField('test_content'); ?>
|
||||
<?php echo $this->form->renderField('image'); ?>
|
||||
<?php echo $this->form->renderField('description'); ?>
|
||||
@@ -44,12 +49,17 @@ HTMLHelper::_('behavior.formvalidator');
|
||||
</a>
|
||||
</fieldset>
|
||||
<?php endif; ?>
|
||||
<?php if (!((string) $this->item->set_type === 'multi' && (int) $this->item->parent_id === 0)) : ?>
|
||||
<fieldset class="mb-3">
|
||||
<legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SELECTED_QUESTIONS'); ?></legend>
|
||||
<div id="set-selected-question-list" class="border rounded p-3">
|
||||
<?php foreach ($this->questions as $question) : ?>
|
||||
<?php if (!in_array((int) $question->id, array_map('intval', (array) $this->item->question_ids), true)) continue; ?>
|
||||
<div class="form-check set-question-row">
|
||||
<?php if ($canOrderQuestions) : ?>
|
||||
<div class="form-text mb-2"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_REORDER_INFO'); ?></div>
|
||||
<?php endif; ?>
|
||||
<div id="set-selected-question-list" class="border rounded p-3" data-sortable="<?php echo $canOrderQuestions ? '1' : '0'; ?>">
|
||||
<?php $questionsById = []; foreach ($this->questions as $availableQuestion) : $questionsById[(int) $availableQuestion->id] = $availableQuestion; endforeach; ?>
|
||||
<?php foreach ((array) $this->item->question_ids as $selectedQuestionId) : ?>
|
||||
<?php $question = $questionsById[(int) $selectedQuestionId] ?? null; if (!$question) continue; ?>
|
||||
<div class="form-check set-question-row"<?php echo $canOrderQuestions ? ' draggable="true"' : ''; ?>>
|
||||
<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; ?>" checked>
|
||||
<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>
|
||||
@@ -109,11 +119,57 @@ HTMLHelper::_('behavior.formvalidator');
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
</fieldset>
|
||||
<?php else : ?>
|
||||
<div class="alert alert-info">
|
||||
<?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_MULTI_QUESTIONS_INFO'); ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</fieldset>
|
||||
<input type="hidden" name="task" value="">
|
||||
<?php echo HTMLHelper::_('form.token'); ?>
|
||||
</form>
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', function () {
|
||||
const list = document.getElementById('set-selected-question-list');
|
||||
|
||||
if (!list || list.dataset.sortable !== '1') {
|
||||
return;
|
||||
}
|
||||
|
||||
let dragged = null;
|
||||
|
||||
list.querySelectorAll('.set-question-row[draggable="true"]').forEach(function (row) {
|
||||
row.addEventListener('dragstart', function (event) {
|
||||
dragged = row;
|
||||
row.classList.add('opacity-50');
|
||||
event.dataTransfer.effectAllowed = 'move';
|
||||
});
|
||||
|
||||
row.addEventListener('dragend', function () {
|
||||
row.classList.remove('opacity-50');
|
||||
dragged = null;
|
||||
});
|
||||
|
||||
row.addEventListener('dragover', function (event) {
|
||||
event.preventDefault();
|
||||
event.dataTransfer.dropEffect = 'move';
|
||||
});
|
||||
|
||||
row.addEventListener('drop', function (event) {
|
||||
event.preventDefault();
|
||||
|
||||
if (!dragged || dragged === row) {
|
||||
return;
|
||||
}
|
||||
|
||||
const rect = row.getBoundingClientRect();
|
||||
const insertAfter = event.clientY > rect.top + rect.height / 2;
|
||||
list.insertBefore(dragged, insertAfter ? row.nextSibling : row);
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', function () {
|
||||
const filter = document.getElementById('set-question-category');
|
||||
const rows = document.querySelectorAll('.set-available-question-row');
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<creationDate>2026-10-14</creationDate>
|
||||
<author>Komponent</author>
|
||||
<license>GNU General Public License version 2 or later</license>
|
||||
<version>1.35.0</version>
|
||||
<version>1.43.7</version>
|
||||
<description>COM_TESTQUESTIONS_DESCRIPTION</description>
|
||||
<element>com_testquestions</element>
|
||||
<namespace path="src">Komponent\Component\Testquestions</namespace>
|
||||
@@ -19,6 +19,7 @@
|
||||
<administration>
|
||||
<menu link="index.php?option=com_testquestions&view=questions">COM_TESTQUESTIONS</menu>
|
||||
<files folder="administrator/components/com_testquestions">
|
||||
<filename>config.xml</filename>
|
||||
<folder>forms</folder>
|
||||
<folder>services</folder>
|
||||
<folder>sql</folder>
|
||||
|
||||
@@ -10,6 +10,7 @@ use Joomla\CMS\MVC\Model\BaseDatabaseModel;
|
||||
class SetModel extends BaseDatabaseModel
|
||||
{
|
||||
protected $resolvedSetId;
|
||||
protected $randomizeQuestions = true;
|
||||
|
||||
protected function getSetId(): int
|
||||
{
|
||||
@@ -44,6 +45,7 @@ class SetModel extends BaseDatabaseModel
|
||||
}
|
||||
|
||||
$this->resolvedSetId = $setId;
|
||||
$this->randomizeQuestions = $set->set_type !== 'multi';
|
||||
|
||||
if ($set->set_type === 'multi') {
|
||||
$variantId = (int) $db->setQuery(
|
||||
@@ -74,15 +76,16 @@ class SetModel extends BaseDatabaseModel
|
||||
return [];
|
||||
}
|
||||
|
||||
return $db->setQuery(
|
||||
$db->getQuery(true)
|
||||
$query = $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.points', '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();
|
||||
->where('q.published = 1');
|
||||
|
||||
$query->order($this->randomizeQuestions ? 'RAND()' : 'sq.ordering ASC, q.id ASC');
|
||||
|
||||
return $db->setQuery($query)->loadObjectList();
|
||||
}
|
||||
|
||||
public function getSets()
|
||||
|
||||
Reference in New Issue
Block a user