Treat placeholder comments as empty in PDF

README.md

@@ -30,6 +30,6 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 
 ## Instalacja
 
-W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.35).
+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**.

administrator/components/com_testquestions/sql/updates/mysql/1.43.36.sql

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.36.

administrator/components/com_testquestions/sql/updates/mysql/1.43.37.sql

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.37.

administrator/components/com_testquestions/sql/updates/mysql/1.43.38.sql

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.38.

administrator/components/com_testquestions/sql/updates/mysql/1.43.39.sql

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.39.

administrator/components/com_testquestions/sql/updates/mysql/1.43.40.sql

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.40.

administrator/components/com_testquestions/sql/updates/mysql/1.43.41.sql

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.41.

administrator/components/com_testquestions/tmpl/result/default.php

@@ -21,6 +21,7 @@ $resolveImageUrl = static function ($path) {
         </button>
     </div>
     <style>
+        .result-pdf-comment { display: none !important; }
         @media print {
             @page { size: A4; margin: 15mm; }
             .no-print, .toolbar, #toolbar, .subhead, .sidebar-wrapper, #sidebar, .navbar,
@@ -31,6 +32,9 @@ $resolveImageUrl = static function ($path) {
             article { break-inside: auto; border-color: #aaa !important; }
             img { max-width: 100% !important; max-height: 150mm; object-fit: contain; }
             .alert { print-color-adjust: exact; -webkit-print-color-adjust: exact; }
+            .container-fluid .result-pdf-comment { display: block !important; }
+            .result-pdf-comment-text { white-space: pre-wrap; }
+            .ai-feedback-screen, .ai-token-info { display: none !important; }
         }
     </style>
     <script>
@@ -39,6 +43,25 @@ $resolveImageUrl = static function ($path) {
                 window.print();
             });
         });
+        window.addEventListener('beforeprint', function () {
+            document.querySelectorAll('.result-pdf-comment').forEach(function (commentBlock) {
+                const questionId = commentBlock.dataset.questionId;
+                let manualComment = document.getElementById('result-comment-' + questionId)?.value.trim() || '';
+                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 selectedComment = manualComment || aiComment;
+
+                // Keep the server-rendered AI fallback when no input/source is found in the DOM.
+                if (output && selectedComment) {
+                    output.textContent = selectedComment;
+                }
+            });
+        });
     </script>
     <dl class="row">
         <div class="row"<?php echo (int) $this->item->extra_time > 0 ? ' style="background-color: #fff3cd;"' : ''; ?>>
@@ -70,7 +93,7 @@ $resolveImageUrl = static function ($path) {
         <?php if ($candidate && $candidate->question_type === 'open' && empty($answer['correct']) && trim((string) ($answer['selected'] ?? '')) !== '') { $pendingAiCount++; } ?>
     <?php endforeach; ?>
     <?php if ($pendingAiCount > 0) : ?>
-        <div class="mb-3">
+        <div class="mb-3 no-print">
             <button type="submit" class="btn btn-primary" formaction="<?php echo Route::_('index.php?option=com_testquestions&task=result.aiAll&id=' . (int) $this->item->id); ?>" onclick="this.form.task.value='result.aiAll';">
                 <?php echo \Joomla\CMS\Language\Text::sprintf('COM_TESTQUESTIONS_AI_EVALUATE_ALL', $pendingAiCount); ?>
             </button>
@@ -91,7 +114,7 @@ $resolveImageUrl = static function ($path) {
             ?>
             <?php if ($usageTotals['total_tokens'] > 0) : ?>
                 <?php $usageProviderLabels = array_map(static function ($usageProvider) { return ['openai' => 'OpenAI', 'grok' => 'Grok', 'groq' => 'Groq', 'gemini' => 'Gemini'][$usageProvider] ?? $usageProvider; }, array_keys($usageTotals['providers'])); ?>
-                <span class="badge text-bg-light border ms-2" title="Suma dotychczasowych ocen AI">
+                <span class="badge text-bg-light border ms-2 ai-token-info" title="Suma dotychczasowych ocen AI">
                     ✦ <?php echo implode(' + ', array_map('htmlspecialchars', $usageProviderLabels)); ?>:
                     <?php echo number_format($usageTotals['total_tokens'], 0, ',', ' '); ?> tokenów,
                     <?php echo $usageTotals['cost_calls'] > 0 ? number_format($usageTotals['cost_usd'], 8, ',', ' ') . ' USD' : 'koszt niedostępny'; ?>
@@ -112,6 +135,12 @@ $resolveImageUrl = static function ($path) {
             $answerStatusCorrect = $awardedPoints > 0 && $awardedPoints >= $maximumPoints;
             $answerStatusPartial = $awardedPoints > 0 && !$answerStatusCorrect;
         }
+        $manualComment = trim((string) ($answer['comment'] ?? ''));
+        if ($manualComment === '-' || $manualComment === '—') {
+            $manualComment = '';
+        }
+        $aiComment = trim((string) ($answer['ai_feedback'] ?? ''));
+        $printComment = $manualComment !== '' ? $manualComment : $aiComment;
         ?>
         <article class="mb-4 border rounded p-3">
             <div class="mb-2"><?php echo $question->question; ?></div>
@@ -123,6 +152,13 @@ $resolveImageUrl = static function ($path) {
                 <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECTED_ANSWER'); ?>:</strong> <?php echo $answer['selected'] ? chr(64 + (int) $answer['selected']) : '—'; ?></div>
             <?php endif; ?>
             <div class="mt-2 <?php echo $answerStatusCorrect ? 'text-success' : ($answerStatusPartial ? 'text-warning' : 'text-danger'); ?>"><?php echo $answerStatusCorrect ? '✓ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_CORRECT') : ($answerStatusPartial ? '◐ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_PARTIALLY_CORRECT') : '✗ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_INCORRECT')); ?></div>
+            <?php if ($question->question_type === 'open') : ?>
+                <div class="result-pdf-comment mt-3" data-question-id="<?php echo (int) $questionId; ?>" data-ai-comment="<?php echo htmlspecialchars($aiComment, ENT_QUOTES, 'UTF-8'); ?>">
+                    <strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_COMMENT'); ?>:</strong><br>
+                    <span class="result-pdf-comment-text"><?php echo htmlspecialchars($printComment !== '' ? $printComment : '—', ENT_QUOTES, 'UTF-8'); ?></span>
+                    <span class="result-pdf-ai-source" hidden><?php echo htmlspecialchars($aiComment, ENT_QUOTES, 'UTF-8'); ?></span>
+                </div>
+            <?php endif; ?>
             <?php if (empty($answer['correct'])) : ?>
                 <?php if ($question->question_type === 'open' && $hasResponse) : ?>
                     <div class="mt-3">
@@ -132,7 +168,7 @@ $resolveImageUrl = static function ($path) {
                         <?php if (!empty($answer['ai_usage']) && is_array($answer['ai_usage'])) : ?>
                             <?php $usage = $answer['ai_usage']; ?>
                             <?php $usageProvider = (string) ($usage['provider'] ?? ''); ?>
-                            <span class="badge text-bg-light border ms-2" title="<?php echo $usageProvider === 'grok' ? 'Koszt zwrócony przez dostawcę' : (in_array($usageProvider, ['groq', 'gemini'], true) ? 'Dostawca zwrócił wykorzystane tokeny; koszt nie jest zwracany przez to API' : 'Koszt obliczony z faktycznie wykorzystanych tokenów i stawek modelu'); ?>">
+                            <span class="badge text-bg-light border ms-2 ai-token-info" title="<?php echo $usageProvider === 'grok' ? 'Koszt zwrócony przez dostawcę' : (in_array($usageProvider, ['groq', 'gemini'], true) ? 'Dostawca zwrócił wykorzystane tokeny; koszt nie jest zwracany przez to API' : 'Koszt obliczony z faktycznie wykorzystanych tokenów i stawek modelu'); ?>">
                                 <?php echo $usageProvider === 'grok' ? '✦ Grok' : ($usageProvider === 'groq' ? '⚡ Groq' : ($usageProvider === 'gemini' ? '✧ Gemini' : '◉ OpenAI')); ?> ·
                                 <?php echo number_format((int) ($usage['input_tokens'] ?? 0), 0, ',', ' '); ?> in /
                                 <?php echo number_format((int) ($usage['output_tokens'] ?? 0), 0, ',', ' '); ?> out ·
@@ -147,11 +183,11 @@ $resolveImageUrl = static function ($path) {
                         $maxPoints = (int) ($question->points ?? 0);
                         $aiAlertClass = $aiPoints <= 0 ? 'alert-danger' : ($aiPoints >= $maxPoints ? 'alert-success' : 'alert-info');
                         ?>
-                        <div class="alert <?php echo $aiAlertClass; ?> mt-3"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_RESULT'); ?>:</strong><br><?php echo nl2br(htmlspecialchars((string) $answer['ai_feedback'], ENT_QUOTES, 'UTF-8')); ?></div>
+                        <div class="alert <?php echo $aiAlertClass; ?> mt-3 ai-feedback-screen" data-question-id="<?php echo (int) $questionId; ?>"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_AI_RESULT'); ?>:</strong><br><span class="ai-feedback-text"><?php echo nl2br(htmlspecialchars((string) $answer['ai_feedback'], ENT_QUOTES, 'UTF-8')); ?></span></div>
                     <?php endif; ?>
                 <?php endif; ?>
                 <?php if ($question->question_type === 'open' && $hasResponse) : ?>
-                    <div class="row mt-3">
+                    <div class="row mt-3 no-print">
                         <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); ?>">

com_testquestions.xml

@@ -4,7 +4,7 @@
     <creationDate>2026-10-14</creationDate>
     <author>Komponent</author>
     <license>GNU General Public License version 2 or later</license>
-    <version>1.43.35</version>
+    <version>1.43.41</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>