Show assessment status in results list

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.29).
+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**.

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"

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.30: odczyt tokenów Gemini z pola usageMetadata.

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

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

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

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

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.

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;

administrator/components/com_testquestions/src/Service/AiService.php

@@ -147,7 +147,9 @@ class AiService
 
     private function getUsage(array $body, string $provider, string $model): ?array
     {
-        $usage = $body['usage'] ?? null;
+        // Gemini uses camelCase UsageMetadata at the response root; the
+        // OpenAI-compatible providers return their counters in `usage`.
+        $usage = $body['usageMetadata'] ?? $body['usage'] ?? null;
         if (!is_array($usage)) {
             return null;
         }

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

@@ -20,10 +20,10 @@ $resolveImageUrl = static function ($path) {
     <?php if ($this->set) : ?>
         <header class="test-set-header">
             <h1><?php echo htmlspecialchars($this->set->title, ENT_QUOTES, 'UTF-8'); ?></h1>
+            <?php if ($this->set->test_content) : ?><div class="test-set-content"><?php echo $this->set->test_content; ?></div><?php endif; ?>
             <?php if ($this->set->image) : ?>
                 <div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($this->set->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div>
             <?php endif; ?>
-            <?php if ($this->set->test_content) : ?><div class="test-set-content"><?php echo $this->set->test_content; ?></div><?php endif; ?>
         </header>
     <?php endif; ?>
     <?php if (!$this->items) : ?>

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 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; ?>
-                <td><?php echo (int) $item->points_before; ?> (<?php echo $pointsBeforePercentage; ?>%) / <?php echo (int) $item->points_after; ?> (<?php echo $pointsAfterPercentage; ?>%)</td>
+                <?php endif; ?>
-                <td><?php echo $this->escape($grade); ?></td>
+                <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>

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.29</version>
+    <version>1.43.33</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>

components/com_testquestions/tmpl/set/default.php

@@ -67,8 +67,8 @@ $resolveImageUrl = static function ($path) {
             <?php if ($this->set->subject_title) : ?><div class="text-muted"><?php echo htmlspecialchars($this->set->subject_title, ENT_QUOTES, 'UTF-8'); ?></div><?php endif; ?>
             <h1><?php echo htmlspecialchars($this->set->title, ENT_QUOTES, 'UTF-8'); ?></h1>
             <?php if ($testDurationSeconds > 0) : ?><div class="small text-muted"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_DURATION'); ?>: <?php echo $durationMinutes; ?> min<?php if ($durationRemainder > 0) : ?> <?php echo $durationRemainder; ?> s<?php endif; ?></div><?php endif; ?>
-            <?php if ($this->set->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($this->set->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
             <?php if ($this->set->test_content) : ?><div class="test-set-content"><?php echo $this->set->test_content; ?></div><?php endif; ?>
+            <?php if ($this->set->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($resolveImageUrl($this->set->image), ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
         </header>
         <?php if (!$this->results && $testDurationSeconds > 0) : ?>
             <div class="timer-container mb-4" id="test-timer-container" data-duration="<?php echo $testDurationSeconds; ?>" aria-live="polite">