From fd37f151ea90a1372391c0d619a26fd92bf4d030 Mon Sep 17 00:00:00 2001
From: Wojtek <wojtek@localhost>
Date: Sat, 17 Oct 2026 13:20:48 +0200
Subject: [PATCH] Print AI feedback directly as fallback comment

---
 README.md                                     |  2 +-
 .../sql/updates/mysql/1.43.42.sql             |  1 +
 .../com_testquestions/tmpl/result/default.php | 29 +++++++++----------
 com_testquestions.xml                         |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 administrator/components/com_testquestions/sql/updates/mysql/1.43.42.sql

diff --git a/README.md b/README.md
index e59afd1..76f4c85 100644
--- a/README.md
+++ b/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.41).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.42).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
diff --git a/administrator/components/com_testquestions/sql/updates/mysql/1.43.42.sql b/administrator/components/com_testquestions/sql/updates/mysql/1.43.42.sql
new file mode 100644
index 0000000..55db4e1
--- /dev/null
+++ b/administrator/components/com_testquestions/sql/updates/mysql/1.43.42.sql
@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.42.
diff --git a/administrator/components/com_testquestions/tmpl/result/default.php b/administrator/components/com_testquestions/tmpl/result/default.php
index db17fd2..3a3a4a7 100644
--- a/administrator/components/com_testquestions/tmpl/result/default.php
+++ b/administrator/components/com_testquestions/tmpl/result/default.php
@@ -32,9 +32,13 @@ $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; }
+            .container-fluid .result-pdf-comment.has-print-comment { display: block !important; }
             .result-pdf-comment-text { white-space: pre-wrap; }
-            .ai-feedback-screen, .ai-token-info { display: none !important; }
+            .ai-token-info { display: none !important; }
+            .ai-feedback-screen.ai-feedback-print-source { display: block !important; }
+            .ai-feedback-screen.ai-feedback-print-source.print-ai-hidden { display: none !important; }
+            .ai-feedback-screen.ai-feedback-print-source > strong { display: none !important; }
+            .ai-feedback-screen.ai-feedback-print-source::before { content: "Komentarz:"; display: block; font-weight: bold; margin-bottom: .35em; }
         }
     </style>
     <script>
@@ -50,15 +54,13 @@ $resolveImageUrl = static function ($path) {
                 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;
+                const aiSource = document.querySelector('.ai-feedback-print-source[data-question-id="' + questionId + '"]');
 
-                // Keep the server-rendered AI fallback when no input/source is found in the DOM.
-                if (output && selectedComment) {
-                    output.textContent = selectedComment;
+                commentBlock.classList.toggle('has-print-comment', Boolean(manualComment));
+                aiSource?.classList.toggle('print-ai-hidden', Boolean(manualComment));
+                if (output && manualComment) {
+                    output.textContent = manualComment;
                 }
             });
         });
@@ -139,8 +141,6 @@ $resolveImageUrl = static function ($path) {
         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>
@@ -153,10 +153,9 @@ $resolveImageUrl = static function ($path) {
             <?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'); ?>">
+                <div class="result-pdf-comment mt-3" data-question-id="<?php echo (int) $questionId; ?>">
                     <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>
+                    <span class="result-pdf-comment-text"><?php echo htmlspecialchars($manualComment, ENT_QUOTES, 'UTF-8'); ?></span>
                 </div>
             <?php endif; ?>
             <?php if (empty($answer['correct'])) : ?>
@@ -183,7 +182,7 @@ $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 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>
+                        <div class="alert <?php echo $aiAlertClass; ?> mt-3 ai-feedback-screen ai-feedback-print-source" 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) : ?>
diff --git a/com_testquestions.xml b/com_testquestions.xml
index 8ed1a93..40f03b4 100644
--- a/com_testquestions.xml
+++ b/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.41</version>
+    <version>1.43.42</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>