From 55dc4c9d3c2f27fc88427326913be2c11a30d1c8 Mon Sep 17 00:00:00 2001
From: Wojtek <wojtek@localhost>
Date: Sat, 17 Oct 2026 13:23:55 +0200
Subject: [PATCH] Render AI evaluation as printable comment

---
 README.md                                     |  2 +-
 .../language/en-GB/com_testquestions.ini      |  1 +
 .../sql/updates/mysql/1.43.44.sql             |  1 +
 .../com_testquestions/tmpl/result/default.php | 30 +++++++++++--------
 com_testquestions.xml                         |  2 +-
 5 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 administrator/components/com_testquestions/sql/updates/mysql/1.43.44.sql

diff --git a/README.md b/README.md
index c8da246..e434361 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.43).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.44).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
diff --git a/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini b/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini
index 5356a14..78e7c50 100644
--- a/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini
+++ b/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini
@@ -131,6 +131,7 @@ COM_TESTQUESTIONS_RESULT_SCORE="Wynik"
 COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER="Punkty przed / po korekcie"
 COM_TESTQUESTIONS_RESULT_GRADE="Ocena"
 COM_TESTQUESTIONS_RESULT_NOT_ASSESSED="Nie sprawdzono"
+COM_TESTQUESTIONS_RESULT_AI_POINTS_COMMENT="Ocena AI: przyznano %s z %s punktów."
 COM_TESTQUESTIONS_RESULT_GENERATE_PDF="Generuj PDF / drukuj"
 COM_TESTQUESTIONS_RESULT_DATE="Data zakończenia"
 COM_TESTQUESTIONS_RESULT_ANSWERS="Odpowiedzi"
diff --git a/administrator/components/com_testquestions/sql/updates/mysql/1.43.44.sql b/administrator/components/com_testquestions/sql/updates/mysql/1.43.44.sql
new file mode 100644
index 0000000..8da3a57
--- /dev/null
+++ b/administrator/components/com_testquestions/sql/updates/mysql/1.43.44.sql
@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.44.
diff --git a/administrator/components/com_testquestions/tmpl/result/default.php b/administrator/components/com_testquestions/tmpl/result/default.php
index db143b4..bdcd20a 100644
--- a/administrator/components/com_testquestions/tmpl/result/default.php
+++ b/administrator/components/com_testquestions/tmpl/result/default.php
@@ -35,10 +35,7 @@ $resolveImageUrl = static function ($path) {
             .container-fluid .result-pdf-comment.has-print-comment { display: block !important; }
             .result-pdf-comment-text { white-space: pre-wrap; }
             .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; }
+            .ai-feedback-screen { display: none !important; }
         }
     </style>
     <script>
@@ -55,12 +52,12 @@ $resolveImageUrl = static function ($path) {
                     manualComment = '';
                 }
                 const output = commentBlock.querySelector('.result-pdf-comment-text');
-                const aiSource = document.querySelector('.ai-feedback-print-source[data-question-id="' + questionId + '"]');
+                const aiComment = commentBlock.dataset.aiComment || '';
+                const selectedComment = manualComment || aiComment;
 
-                commentBlock.classList.toggle('has-print-comment', Boolean(manualComment));
-                aiSource?.classList.toggle('print-ai-hidden', Boolean(manualComment));
-                if (output && manualComment) {
-                    output.textContent = manualComment;
+                commentBlock.classList.toggle('has-print-comment', Boolean(selectedComment));
+                if (output && selectedComment) {
+                    output.textContent = selectedComment;
                 }
             });
         });
@@ -141,6 +138,15 @@ $resolveImageUrl = static function ($path) {
         if ($manualComment === '-' || $manualComment === '—') {
             $manualComment = '';
         }
+        $aiComment = trim((string) ($answer['ai_feedback'] ?? ''));
+        if ($aiComment === '' && (array_key_exists('ai_feedback', $answer) || !empty($answer['ai_usage']) || !empty($answer['ai_usage_history']))) {
+            $aiComment = \Joomla\CMS\Language\Text::sprintf(
+                'COM_TESTQUESTIONS_RESULT_AI_POINTS_COMMENT',
+                (int) ($answer['awarded_points'] ?? 0),
+                (int) ($question->points ?? 0)
+            );
+        }
+        $printComment = $manualComment !== '' ? $manualComment : $aiComment;
         ?>
         <article class="mb-4 border rounded p-3">
             <div class="mb-2"><?php echo $question->question; ?></div>
@@ -153,9 +159,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; ?>">
+                <div class="result-pdf-comment mt-3<?php echo $printComment !== '' ? ' has-print-comment' : ''; ?>" 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($manualComment, ENT_QUOTES, 'UTF-8'); ?></span>
+                    <span class="result-pdf-comment-text"><?php echo nl2br(htmlspecialchars($printComment, ENT_QUOTES, 'UTF-8')); ?></span>
                 </div>
             <?php endif; ?>
             <?php if ($question->question_type === 'open' && !empty($answer['ai_feedback'])) : ?>
@@ -164,7 +170,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 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>
+                <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 if (empty($answer['correct'])) : ?>
                 <?php if ($question->question_type === 'open' && $hasResponse) : ?>
diff --git a/com_testquestions.xml b/com_testquestions.xml
index 9e393bd..54612e7 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.43</version>
+    <version>1.43.44</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>