Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
804c8f5467 |
@@ -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.41.0).
|
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.42.0).
|
||||||
|
|
||||||
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
|
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
|
||||||
|
|||||||
@@ -62,6 +62,14 @@ 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_AI_SETTINGS="Ustawienia AI"
|
||||||
|
COM_TESTQUESTIONS_AI_PROVIDER="Dostawca AI"
|
||||||
|
COM_TESTQUESTIONS_AI_API_KEY="Klucz API"
|
||||||
|
COM_TESTQUESTIONS_AI_SETTINGS_MENU="Konfiguracja 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_DESCRIPTION="Opis zestawu"
|
||||||
COM_TESTQUESTIONS_SET_QUESTIONS="Pytania w zestawie"
|
COM_TESTQUESTIONS_SET_QUESTIONS="Pytania w zestawie"
|
||||||
COM_TESTQUESTIONS_SET_QUESTION_COUNT="Liczba pytań"
|
COM_TESTQUESTIONS_SET_QUESTION_COUNT="Liczba pytań"
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
-- AI feedback is stored in the existing answers JSON column.
|
||||||
@@ -32,6 +32,34 @@ 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) {
|
||||||
|
$message = $error->getMessage() === 'AI_NOT_CONFIGURED'
|
||||||
|
? Text::_('COM_TESTQUESTIONS_AI_NOT_CONFIGURED')
|
||||||
|
: Text::sprintf('COM_TESTQUESTIONS_AI_ERROR', $error->getMessage());
|
||||||
|
$type = 'error';
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->setRedirect(
|
||||||
|
Route::_('index.php?option=com_testquestions&view=result&id=' . $id, false),
|
||||||
|
$message,
|
||||||
|
$type
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
private function saveAssessment(): void
|
private function saveAssessment(): void
|
||||||
{
|
{
|
||||||
if (!Session::checkToken()) {
|
if (!Session::checkToken()) {
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ defined('_JEXEC') or die;
|
|||||||
|
|
||||||
use Joomla\CMS\Factory;
|
use Joomla\CMS\Factory;
|
||||||
use Joomla\CMS\MVC\Model\BaseDatabaseModel;
|
use Joomla\CMS\MVC\Model\BaseDatabaseModel;
|
||||||
|
use Joomla\CMS\Component\ComponentHelper;
|
||||||
|
use Komponent\Component\Testquestions\Administrator\Service\AiService;
|
||||||
|
|
||||||
class ResultModel extends BaseDatabaseModel
|
class ResultModel extends BaseDatabaseModel
|
||||||
{
|
{
|
||||||
@@ -72,4 +74,42 @@ class ResultModel extends BaseDatabaseModel
|
|||||||
|
|
||||||
return (bool) $db->updateObject('#__testquestions_results', $row, 'id');
|
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');
|
||||||
|
$feedback = (new AiService())->evaluate(
|
||||||
|
(string) $params->get('ai_provider', 'openai'),
|
||||||
|
(string) $params->get('ai_api_key', ''),
|
||||||
|
strip_tags((string) $question->question),
|
||||||
|
(string) ($answer['selected'] ?? ''),
|
||||||
|
(string) $question->answer_open
|
||||||
|
);
|
||||||
|
$item->answers[$questionId]['ai_feedback'] = $feedback;
|
||||||
|
|
||||||
|
$db = Factory::getContainer()->get('DatabaseDriver');
|
||||||
|
$row = (object) [
|
||||||
|
'id' => $id,
|
||||||
|
'answers' => json_encode($item->answers, JSON_UNESCAPED_UNICODE),
|
||||||
|
];
|
||||||
|
|
||||||
|
if (!$db->updateObject('#__testquestions_results', $row, 'id')) {
|
||||||
|
throw new \RuntimeException('Nie udało się zapisać oceny AI.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $feedback;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Komponent\Component\Testquestions\Administrator\Service;
|
||||||
|
|
||||||
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
|
use Joomla\CMS\Http\HttpFactory;
|
||||||
|
|
||||||
|
class AiService
|
||||||
|
{
|
||||||
|
public function evaluate(string $provider, string $apiKey, string $question, string $answer, string $pattern): string
|
||||||
|
{
|
||||||
|
$provider = strtolower(trim($provider));
|
||||||
|
$config = $provider === 'grok'
|
||||||
|
? ['url' => 'https://api.x.ai/v1/responses', 'model' => 'grok-4.7']
|
||||||
|
: ['url' => 'https://api.openai.com/v1/responses', 'model' => 'gpt-4.1-mini'];
|
||||||
|
|
||||||
|
if (!in_array($provider, ['openai', 'grok'], true) || trim($apiKey) === '') {
|
||||||
|
throw new \RuntimeException('AI_NOT_CONFIGURED');
|
||||||
|
}
|
||||||
|
|
||||||
|
$input = "Oceń odpowiedź ucznia na pytanie otwarte.\n\n"
|
||||||
|
. "Pytanie:\n" . $question . "\n\n"
|
||||||
|
. "Wzorzec odpowiedzi:\n" . $pattern . "\n\n"
|
||||||
|
. "Odpowiedź ucznia:\n" . ($answer !== '' ? $answer : 'Brak odpowiedzi') . "\n\n"
|
||||||
|
. "Napisz po polsku krótką ocenę: czy odpowiedź może zostać uznana za poprawną, jakie elementy są poprawne lub błędne oraz czy warto przyznać punkty. Nie zmieniaj wzorca odpowiedzi.";
|
||||||
|
|
||||||
|
$payload = json_encode([
|
||||||
|
'model' => $config['model'],
|
||||||
|
'input' => $input,
|
||||||
|
'temperature' => 0.1,
|
||||||
|
], 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.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $text;
|
||||||
|
}
|
||||||
|
|
||||||
|
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));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -63,5 +63,11 @@ class HtmlView extends BaseHtmlView
|
|||||||
'COM_TESTQUESTIONS_RESULTS',
|
'COM_TESTQUESTIONS_RESULTS',
|
||||||
'list'
|
'list'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
ToolbarHelper::link(
|
||||||
|
'index.php?option=com_config&view=component&component=com_testquestions',
|
||||||
|
'COM_TESTQUESTIONS_AI_SETTINGS_MENU',
|
||||||
|
'cog'
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,6 +38,16 @@
|
|||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<div class="mt-2 <?php echo !empty($answer['correct']) ? 'text-success' : 'text-danger'; ?>"><?php echo !empty($answer['correct']) ? '✓ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_CORRECT') : '✗ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_INCORRECT'); ?></div>
|
<div class="mt-2 <?php echo !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'])) : ?>
|
<?php if (empty($answer['correct'])) : ?>
|
||||||
|
<?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>
|
||||||
|
</div>
|
||||||
|
<?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; ?>
|
||||||
<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>
|
||||||
|
|||||||
+12
-1
@@ -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.41.0</version>
|
<version>1.42.0</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>
|
||||||
@@ -30,6 +30,17 @@
|
|||||||
<language tag="en-GB">en-GB/com_testquestions.sys.ini</language>
|
<language tag="en-GB">en-GB/com_testquestions.sys.ini</language>
|
||||||
</languages>
|
</languages>
|
||||||
</administration>
|
</administration>
|
||||||
|
<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="password" label="COM_TESTQUESTIONS_AI_API_KEY" filter="raw" autocomplete="off" />
|
||||||
|
</fieldset>
|
||||||
|
</fields>
|
||||||
|
</config>
|
||||||
<install>
|
<install>
|
||||||
<sql>
|
<sql>
|
||||||
<file driver="mysql" charset="utf8mb4">sql/install.mysql.utf8mb4.sql</file>
|
<file driver="mysql" charset="utf8mb4">sql/install.mysql.utf8mb4.sql</file>
|
||||||
|
|||||||
Reference in New Issue
Block a user