From c9ba3df1f37007400071775fb55648e88152ca26 Mon Sep 17 00:00:00 2001
From: Wojtek <wojtek@localhost>
Date: Sat, 17 Oct 2026 12:16:47 +0200
Subject: [PATCH] Show assessment status in results list

---
 README.md                                          |  2 +-
 .../language/en-GB/com_testquestions.ini           |  1 +
 .../sql/updates/mysql/1.43.33.sql                  |  1 +
 .../com_testquestions/src/Model/ResultsModel.php   |  6 ++++++
 .../com_testquestions/tmpl/results/default.php     | 14 ++++++++------
 com_testquestions.xml                              |  2 +-
 6 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 administrator/components/com_testquestions/sql/updates/mysql/1.43.33.sql

diff --git a/README.md b/README.md
index 46fda20..8ebf593 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.32).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.33).
 
 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 51f79fb..dedc7b3 100644
--- a/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini
+++ b/administrator/components/com_testquestions/language/en-GB/com_testquestions.ini
@@ -130,6 +130,7 @@ COM_TESTQUESTIONS_RESULTS_AI_TOKENS_TOTAL="Łączne wykorzystanie tokenów w wyn
 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_DATE="Data zakończenia"
 COM_TESTQUESTIONS_RESULT_ANSWERS="Odpowiedzi"
 COM_TESTQUESTIONS_RESULT_EXECUTION_TIME="Czas wykonania"
diff --git a/administrator/components/com_testquestions/sql/updates/mysql/1.43.33.sql b/administrator/components/com_testquestions/sql/updates/mysql/1.43.33.sql
new file mode 100644
index 0000000..3395d2b
--- /dev/null
+++ b/administrator/components/com_testquestions/sql/updates/mysql/1.43.33.sql
@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.33.
diff --git a/administrator/components/com_testquestions/src/Model/ResultsModel.php b/administrator/components/com_testquestions/src/Model/ResultsModel.php
index b3ac1f2..447083f 100644
--- a/administrator/components/com_testquestions/src/Model/ResultsModel.php
+++ b/administrator/components/com_testquestions/src/Model/ResultsModel.php
@@ -14,6 +14,7 @@ class ResultsModel extends ListModel
         $items = parent::getItems();
 
         foreach ($items as $item) {
+            $item->has_assessment = false;
             $item->ai_input_tokens = 0;
             $item->ai_output_tokens = 0;
             $item->ai_total_tokens = 0;
@@ -30,6 +31,11 @@ class ResultsModel extends ListModel
                     continue;
                 }
 
+                // Manual assessment and AI both save awarded_points in the answer JSON.
+                if (array_key_exists('awarded_points', $answer)) {
+                    $item->has_assessment = true;
+                }
+
                 $usages = $answer['ai_usage_history'] ?? (isset($answer['ai_usage']) ? [$answer['ai_usage']] : []);
                 if (!is_array($usages)) {
                     continue;
diff --git a/administrator/components/com_testquestions/tmpl/results/default.php b/administrator/components/com_testquestions/tmpl/results/default.php
index 2b2211b..1f8e278 100644
--- a/administrator/components/com_testquestions/tmpl/results/default.php
+++ b/administrator/components/com_testquestions/tmpl/results/default.php
@@ -84,12 +84,14 @@ HTMLHelper::_('behavior.multiselect');
                 <?php $pointsTotal = (int) $item->points_total ?: (int) $item->total_count; ?>
                 <?php $pointsBeforePercentage = $pointsTotal ? round(((int) $item->points_before / $pointsTotal) * 100, 2) : 0; ?>
                 <?php $pointsAfterPercentage = $pointsTotal ? round(((int) $item->points_after / $pointsTotal) * 100, 2) : 0; ?>
-                <?php $grade = 'NDST'; ?>
-                <?php foreach ([['CEL', 100], ['BDB', 90], ['BDB-', 80], ['DB+', 75], ['DB', 70], ['DB-', 65], ['DST+', 60], ['DST', 55], ['DST-', 50], ['DOP+', 45], ['DOP', 40], ['DOP-', 35], ['NDST+', 30], ['NDST', 0]] as $gradeScale) : ?>
-                    <?php if ($pointsAfterPercentage >= $gradeScale[1]) { $grade = $gradeScale[0]; break; } ?>
-                <?php endforeach; ?>
-                <td><?php echo (int) $item->points_before; ?> (<?php echo $pointsBeforePercentage; ?>%) / <?php echo (int) $item->points_after; ?> (<?php echo $pointsAfterPercentage; ?>%)</td>
-                <td><?php echo $this->escape($grade); ?></td>
+                <?php if ($item->has_assessment) : ?>
+                    <?php $grade = 'NDST'; ?>
+                    <?php foreach ([['CEL', 100], ['BDB', 90], ['BDB-', 80], ['DB+', 75], ['DB', 70], ['DB-', 65], ['DST+', 60], ['DST', 55], ['DST-', 50], ['DOP+', 45], ['DOP', 40], ['DOP-', 35], ['NDST+', 30], ['NDST', 0]] as $gradeScale) : ?>
+                        <?php if ($pointsAfterPercentage >= $gradeScale[1]) { $grade = $gradeScale[0]; break; } ?>
+                    <?php endforeach; ?>
+                <?php endif; ?>
+                <td><?php echo (int) $item->points_before; ?> (<?php echo $pointsBeforePercentage; ?>%) / <?php if ($item->has_assessment) : ?><?php echo (int) $item->points_after; ?> (<?php echo $pointsAfterPercentage; ?>%)<?php else : ?><span class="text-muted"><?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_NOT_ASSESSED')); ?></span><?php endif; ?></td>
+                <td><?php echo $item->has_assessment ? $this->escape($grade) : '<span class="text-muted">' . $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_NOT_ASSESSED')) . '</span>'; ?></td>
                 <td><?php echo floor((int) $item->execution_time / 60); ?>:<?php echo str_pad((string) ((int) $item->execution_time % 60), 2, '0', STR_PAD_LEFT); ?></td>
                 <td><?php echo HTMLHelper::_('date', $item->created, 'Y-m-d H:i'); ?></td>
                 <td>
diff --git a/com_testquestions.xml b/com_testquestions.xml
index 057b25a..f84741e 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.32</version>
+    <version>1.43.33</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>