Compare commits

..
4 Commits
Author SHA1 Message Date
Wojtek 175dacf07a Treat placeholder comments as empty in PDF 2026-10-17 13:18:25 +02:00
Wojtek dba7a2511d Preserve AI comments in PDF output 2026-10-17 13:16:34 +02:00
Wojtek 6d15fd05a8 Embed AI fallback in PDF comment block 2026-10-17 13:14:08 +02:00
Wojtek bcd9335a47 Use rendered AI feedback in PDF comments 2026-10-17 13:12:11 +02:00
7 changed files with 23 additions and 8 deletions
+1 -1
View File
@@ -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.37). W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.41).
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**. Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
@@ -0,0 +1 @@
-- Brak zmian w schemacie bazy danych w wersji 1.43.38.
@@ -0,0 +1 @@
-- Brak zmian w schemacie bazy danych w wersji 1.43.39.
@@ -0,0 +1 @@
-- Brak zmian w schemacie bazy danych w wersji 1.43.40.
@@ -0,0 +1 @@
-- Brak zmian w schemacie bazy danych w wersji 1.43.41.
@@ -46,12 +46,19 @@ $resolveImageUrl = static function ($path) {
window.addEventListener('beforeprint', function () { window.addEventListener('beforeprint', function () {
document.querySelectorAll('.result-pdf-comment').forEach(function (commentBlock) { document.querySelectorAll('.result-pdf-comment').forEach(function (commentBlock) {
const questionId = commentBlock.dataset.questionId; const questionId = commentBlock.dataset.questionId;
const manualComment = document.getElementById('result-comment-' + questionId)?.value.trim() || ''; let manualComment = document.getElementById('result-comment-' + questionId)?.value.trim() || '';
const aiComment = commentBlock.dataset.aiComment || ''; if (manualComment === '-' || manualComment === '—') {
manualComment = '';
}
const storedAiFeedback = commentBlock.querySelector('.result-pdf-ai-source')?.textContent.trim() || '';
const visibleAiFeedback = document.querySelector('.ai-feedback-screen[data-question-id="' + questionId + '"] .ai-feedback-text')?.textContent.trim() || '';
const aiComment = storedAiFeedback || visibleAiFeedback;
const output = commentBlock.querySelector('.result-pdf-comment-text'); const output = commentBlock.querySelector('.result-pdf-comment-text');
const selectedComment = manualComment || aiComment;
if (output) { // Keep the server-rendered AI fallback when no input/source is found in the DOM.
output.textContent = manualComment || aiComment || '—'; if (output && selectedComment) {
output.textContent = selectedComment;
} }
}); });
}); });
@@ -129,6 +136,9 @@ $resolveImageUrl = static function ($path) {
$answerStatusPartial = $awardedPoints > 0 && !$answerStatusCorrect; $answerStatusPartial = $awardedPoints > 0 && !$answerStatusCorrect;
} }
$manualComment = trim((string) ($answer['comment'] ?? '')); $manualComment = trim((string) ($answer['comment'] ?? ''));
if ($manualComment === '-' || $manualComment === '—') {
$manualComment = '';
}
$aiComment = trim((string) ($answer['ai_feedback'] ?? '')); $aiComment = trim((string) ($answer['ai_feedback'] ?? ''));
$printComment = $manualComment !== '' ? $manualComment : $aiComment; $printComment = $manualComment !== '' ? $manualComment : $aiComment;
?> ?>
@@ -146,6 +156,7 @@ $resolveImageUrl = static function ($path) {
<div class="result-pdf-comment mt-3" data-question-id="<?php echo (int) $questionId; ?>" data-ai-comment="<?php echo htmlspecialchars($aiComment, ENT_QUOTES, 'UTF-8'); ?>"> <div class="result-pdf-comment mt-3" data-question-id="<?php echo (int) $questionId; ?>" data-ai-comment="<?php echo htmlspecialchars($aiComment, ENT_QUOTES, 'UTF-8'); ?>">
<strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_COMMENT'); ?>:</strong><br> <strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_COMMENT'); ?>:</strong><br>
<span class="result-pdf-comment-text"><?php echo htmlspecialchars($printComment !== '' ? $printComment : '—', ENT_QUOTES, 'UTF-8'); ?></span> <span class="result-pdf-comment-text"><?php echo htmlspecialchars($printComment !== '' ? $printComment : '—', ENT_QUOTES, 'UTF-8'); ?></span>
<span class="result-pdf-ai-source" hidden><?php echo htmlspecialchars($aiComment, ENT_QUOTES, 'UTF-8'); ?></span>
</div> </div>
<?php endif; ?> <?php endif; ?>
<?php if (empty($answer['correct'])) : ?> <?php if (empty($answer['correct'])) : ?>
@@ -172,11 +183,11 @@ $resolveImageUrl = static function ($path) {
$maxPoints = (int) ($question->points ?? 0); $maxPoints = (int) ($question->points ?? 0);
$aiAlertClass = $aiPoints <= 0 ? 'alert-danger' : ($aiPoints >= $maxPoints ? 'alert-success' : 'alert-info'); $aiAlertClass = $aiPoints <= 0 ? 'alert-danger' : ($aiPoints >= $maxPoints ? 'alert-success' : 'alert-info');
?> ?>
<div class="alert <?php echo $aiAlertClass; ?> mt-3 ai-feedback-screen"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_RESULT'); ?>:</strong><br><?php echo nl2br(htmlspecialchars((string) $answer['ai_feedback'], ENT_QUOTES, 'UTF-8')); ?></div> <div class="alert <?php echo $aiAlertClass; ?> mt-3 ai-feedback-screen" data-question-id="<?php echo (int) $questionId; ?>"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_RESULT'); ?>:</strong><br><span class="ai-feedback-text"><?php echo nl2br(htmlspecialchars((string) $answer['ai_feedback'], ENT_QUOTES, 'UTF-8')); ?></span></div>
<?php endif; ?> <?php endif; ?>
<?php endif; ?> <?php endif; ?>
<?php if ($question->question_type === 'open' && $hasResponse) : ?> <?php if ($question->question_type === 'open' && $hasResponse) : ?>
<div class="row mt-3"> <div class="row mt-3 no-print">
<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>
<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); ?>"> <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); ?>">
+1 -1
View File
@@ -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.37</version> <version>1.43.41</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>