From d4894f61ee43055010ad7b01ade98c8872fcaa51 Mon Sep 17 00:00:00 2001
From: Wojtek <wojtek@localhost>
Date: Sat, 17 Oct 2026 13:06:59 +0200
Subject: [PATCH] Clean up AI information in printable results

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

diff --git a/README.md b/README.md
index 680aa1d..8a51f71 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.35).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.36).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
diff --git a/administrator/components/com_testquestions/sql/updates/mysql/1.43.36.sql b/administrator/components/com_testquestions/sql/updates/mysql/1.43.36.sql
new file mode 100644
index 0000000..d724451
--- /dev/null
+++ b/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.
diff --git a/administrator/components/com_testquestions/tmpl/result/default.php b/administrator/components/com_testquestions/tmpl/result/default.php
index 7008436..a55e810 100644
--- a/administrator/components/com_testquestions/tmpl/result/default.php
+++ b/administrator/components/com_testquestions/tmpl/result/default.php
@@ -21,6 +21,7 @@ $resolveImageUrl = static function ($path) {
         </button>
     </div>
     <style>
+        .pdf-only { display: none !important; }
         @media print {
             @page { size: A4; margin: 15mm; }
             .no-print, .toolbar, #toolbar, .subhead, .sidebar-wrapper, #sidebar, .navbar,
@@ -31,6 +32,8 @@ $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; }
+            .pdf-only { display: block !important; }
+            .ai-feedback-screen, .ai-token-info { display: none !important; }
         }
     </style>
     <script>
@@ -70,7 +73,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 +94,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 +115,9 @@ $resolveImageUrl = static function ($path) {
             $answerStatusCorrect = $awardedPoints > 0 && $awardedPoints >= $maximumPoints;
             $answerStatusPartial = $awardedPoints > 0 && !$answerStatusCorrect;
         }
+        $manualComment = trim((string) ($answer['comment'] ?? ''));
+        $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 +129,9 @@ $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 ($printComment !== '') : ?>
+                <div class="pdf-only mt-3"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_COMMENT'); ?>:</strong><br><?php echo nl2br(htmlspecialchars($printComment, ENT_QUOTES, 'UTF-8')); ?></div>
+            <?php endif; ?>
             <?php if (empty($answer['correct'])) : ?>
                 <?php if ($question->question_type === 'open' && $hasResponse) : ?>
                     <div class="mt-3">
@@ -132,7 +141,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,7 +156,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"><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"><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; ?>
                 <?php if ($question->question_type === 'open' && $hasResponse) : ?>
diff --git a/com_testquestions.xml b/com_testquestions.xml
index 03511d0..71c5ac6 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.35</version>
+    <version>1.43.36</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>