Add per-question result assessment fields

README.md

@@ -16,6 +16,7 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - zegar odliczający czas testu i automatyczne zakończenie po jego upływie,
 - zapisywanie wyników testów i zaznaczonych odpowiedzi w bazie danych,
 - podgląd zapisanych testów w panelu administratora,
+- zapisywanie i wyświetlanie czasu wykonania testu,
 - pozycję menu „Arkusz egzaminacyjny” z opcjonalnym symbolem arkusza,
 - listę wyboru dostępnych symboli arkuszy na stronie klienckiej,
 - możliwość rozwiązania arkusza i wyświetlenia wyniku oraz odpowiedzi poprawnych i zaznaczonych,
@@ -29,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.18.1).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.20.0).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/language/en-GB/com_testquestions.ini

@@ -69,6 +69,10 @@ COM_TESTQUESTIONS_RESULT_PARTICIPANT="Użytkownik"
 COM_TESTQUESTIONS_RESULT_SCORE="Wynik"
 COM_TESTQUESTIONS_RESULT_DATE="Data zakończenia"
 COM_TESTQUESTIONS_RESULT_ANSWERS="Odpowiedzi"
+COM_TESTQUESTIONS_RESULT_EXECUTION_TIME="Czas wykonania"
+COM_TESTQUESTIONS_RESULT_AWARDED_POINTS="Uznane punkty"
+COM_TESTQUESTIONS_RESULT_COMMENT="Komentarz"
+COM_TESTQUESTIONS_RESULT_SAVED="Dane wyniku zostały zapisane."
 COM_TESTQUESTIONS_RESULTS_SEARCH="Szukaj po użytkowniku lub zestawie..."
 COM_TESTQUESTIONS_YOUR_ANSWER="Twoja odpowiedź"
 COM_TESTQUESTIONS_SELECTED_ANSWER="Zaznaczona odpowiedź"

administrator/components/com_testquestions/sql/install.mysql.utf8mb4.sql

@@ -78,6 +78,8 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_results` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `set_id` int unsigned NOT NULL,
   `participant_name` varchar(255) NOT NULL DEFAULT '',
+  `started` datetime NULL DEFAULT NULL,
+  `execution_time` int unsigned NOT NULL DEFAULT 0,
   `extra_time` smallint unsigned NOT NULL DEFAULT 0,
   `correct_count` smallint unsigned NOT NULL DEFAULT 0,
   `total_count` smallint unsigned NOT NULL DEFAULT 0,

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

@@ -0,0 +1,3 @@
+ALTER TABLE `#__testquestions_results`
+  ADD COLUMN `started` datetime NULL DEFAULT NULL AFTER `participant_name`,
+  ADD COLUMN `execution_time` int unsigned NOT NULL DEFAULT 0 AFTER `started`;

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

@@ -0,0 +1 @@
+-- No database changes required for version 1.19.1.

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

@@ -0,0 +1 @@
+-- Per-question awarded points and comments are stored in the existing answers JSON column.

administrator/components/com_testquestions/src/Controller/ResultController.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+
+class ResultController extends BaseController
+{
+    public function save(): void
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
+        }
+
+        $input = Factory::getApplication()->getInput();
+        $id = $input->post->getInt('id');
+        $points = (array) $input->post->get('awarded_points', [], 'array');
+        $comments = (array) $input->post->get('comments', [], 'array');
+        $model = $this->getModel('Result');
+
+        if (!$model->saveAssessment($id, $points, $comments)) {
+            throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_RESULT_NOT_FOUND'));
+        }
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=result&id=' . $id, false),
+            Text::_('COM_TESTQUESTIONS_RESULT_SAVED')
+        );
+    }
+}

administrator/components/com_testquestions/src/Model/ResultModel.php

@@ -33,7 +33,7 @@ class ResultModel extends BaseDatabaseModel
         if ($ids) {
             $item->questions = $db->setQuery(
                 $db->getQuery(true)
-                    ->select(['id', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer'])
+                    ->select(['id', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'points'])
                     ->from($db->quoteName('#__testquestions_questions'))
                     ->where('id IN (' . implode(',', $ids) . ')')
             )->loadObjectList('id');
@@ -41,4 +41,28 @@ class ResultModel extends BaseDatabaseModel
 
         return $item;
     }
+
+    public function saveAssessment(int $id, array $awardedPoints, array $comments): bool
+    {
+        $item = $this->getItem($id);
+
+        if (!$item) {
+            return false;
+        }
+
+        foreach ($item->answers as $questionId => &$answer) {
+            $key = (string) $questionId;
+            $answer['awarded_points'] = max(0, (int) ($awardedPoints[$key] ?? 0));
+            $answer['comment'] = trim((string) ($comments[$key] ?? ''));
+        }
+        unset($answer);
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $row = (object) [
+            'id' => $id,
+            'answers' => json_encode($item->answers, JSON_UNESCAPED_UNICODE),
+        ];
+
+        return (bool) $db->updateObject('#__testquestions_results', $row, 'id');
+    }
 }

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

@@ -1,13 +1,20 @@
 <?php defined('_JEXEC') or die; ?>
+<?php use Joomla\CMS\HTML\HTMLHelper; ?>
+<?php use Joomla\CMS\Router\Route; ?>
 <div class="container-fluid">
     <dl class="row">
-        <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_PARTICIPANT'); ?></dt>
+        <div class="row"<?php echo (int) $this->item->extra_time > 0 ? ' style="background-color: #fff3cd;"' : ''; ?>>
-        <dd class="col-sm-9"><?php echo $this->escape($this->item->participant_name); ?></dd>
+            <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_PARTICIPANT'); ?></dt>
+            <dd class="col-sm-9"><?php echo $this->escape($this->item->participant_name); ?></dd>
+        </div>
         <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></dt>
         <dd class="col-sm-9"><?php echo $this->escape(($this->item->subject_title ? $this->item->subject_title . ' — ' : '') . $this->item->set_title); ?></dd>
         <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_SCORE'); ?></dt>
         <dd class="col-sm-9"><?php echo (int) $this->item->correct_count; ?> / <?php echo (int) $this->item->total_count; ?> (<?php echo htmlspecialchars((string) $this->item->percentage, ENT_QUOTES, 'UTF-8'); ?>%)</dd>
+        <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_EXECUTION_TIME'); ?></dt>
+        <dd class="col-sm-9"><?php echo floor((int) $this->item->execution_time / 60); ?>:<?php echo str_pad((string) ((int) $this->item->execution_time % 60), 2, '0', STR_PAD_LEFT); ?></dd>
     </dl>
+    <form action="<?php echo Route::_('index.php?option=com_testquestions&view=result&id=' . (int) $this->item->id); ?>" method="post" name="resultForm" id="result-form">
     <h2><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_ANSWERS'); ?></h2>
     <?php foreach ($this->item->answers as $questionId => $answer) : ?>
         <?php $question = $this->item->questions[(int) $questionId] ?? null; if (!$question) continue; ?>
@@ -21,6 +28,21 @@
                 <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_ANSWER'); ?>:</strong> <?php echo chr(64 + (int) $question->correct_answer); ?></div>
             <?php endif; ?>
             <div class="mt-2 <?php echo !empty($answer['correct']) ? 'text-success' : 'text-danger'; ?>"><?php echo !empty($answer['correct']) ? '✓ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_CORRECT') : '✗ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_INCORRECT'); ?></div>
+            <div class="row mt-3">
+                <div class="col-md-3">
+                    <label for="awarded-points-<?php echo (int) $questionId; ?>" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_AWARDED_POINTS'); ?></label>
+                    <input type="number" min="0" name="awarded_points[<?php echo (int) $questionId; ?>]" id="awarded-points-<?php echo (int) $questionId; ?>" class="form-control" value="<?php echo (int) ($answer['awarded_points'] ?? 0); ?>">
+                </div>
+                <div class="col-md-9">
+                    <label for="result-comment-<?php echo (int) $questionId; ?>" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_COMMENT'); ?></label>
+                    <textarea name="comments[<?php echo (int) $questionId; ?>]" id="result-comment-<?php echo (int) $questionId; ?>" class="form-control" rows="2"><?php echo htmlspecialchars((string) ($answer['comment'] ?? ''), ENT_QUOTES, 'UTF-8'); ?></textarea>
+                </div>
+            </div>
         </article>
     <?php endforeach; ?>
+    <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSAVE'); ?></button>
+    <input type="hidden" name="task" value="result.save">
+    <input type="hidden" name="id" value="<?php echo (int) $this->item->id; ?>">
+    <?php echo HTMLHelper::_('form.token'); ?>
+    </form>
 </div>

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

@@ -17,6 +17,7 @@ use Joomla\CMS\Router\Route;
             <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_PARTICIPANT'); ?></th>
             <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></th>
             <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_SCORE'); ?></th>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_EXECUTION_TIME'); ?></th>
             <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_DATE'); ?></th>
         </tr></thead>
         <tbody>
@@ -25,6 +26,7 @@ use Joomla\CMS\Router\Route;
                 <th><a href="<?php echo Route::_('index.php?option=com_testquestions&view=result&id=' . (int) $item->id); ?>"><?php echo $this->escape($item->participant_name); ?></a></th>
                 <td><?php echo $this->escape(($item->subject_title ? $item->subject_title . ' — ' : '') . $item->set_title); ?></td>
                 <td><?php echo (int) $item->correct_count; ?> / <?php echo (int) $item->total_count; ?> (<?php echo htmlspecialchars((string) $item->percentage, ENT_QUOTES, 'UTF-8'); ?>%)</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>
             </tr>
         <?php endforeach; ?>

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

components/com_testquestions/src/Model/SetModel.php

@@ -71,7 +71,7 @@ class SetModel extends BaseDatabaseModel
         )->loadObjectList();
     }
 
-    public function saveResult(string $participantName, int $extraTime, array $result): bool
+    public function saveResult(string $participantName, int $extraTime, int $startedAt, array $result): bool
     {
         $db = Factory::getContainer()->get('DatabaseDriver');
         $setId = $this->getSetId();
@@ -84,6 +84,8 @@ class SetModel extends BaseDatabaseModel
         $row = (object) [
             'set_id' => $setId,
             'participant_name' => trim($participantName),
+            'started' => $startedAt > 0 ? gmdate('Y-m-d H:i:s', $startedAt) : null,
+            'execution_time' => $startedAt > 0 ? max(0, time() - $startedAt) : 0,
             'extra_time' => max(0, $extraTime),
             'correct_count' => (int) ($result['correct'] ?? 0),
             'total_count' => (int) ($result['total'] ?? 0),

components/com_testquestions/src/View/Set/HtmlView.php

@@ -34,6 +34,7 @@ class HtmlView extends BaseHtmlView
             $this->getModel()->saveResult(
                 $input->post->getString('participant_name', ''),
                 $input->post->getInt('extra_time', 0),
+                $input->post->getInt('test_started_at', 0),
                 $this->results
             );
         }

components/com_testquestions/tmpl/set/default.php

@@ -31,6 +31,7 @@ use Joomla\CMS\Factory;
             </select>
         </div>
         <input type="submit" class="egzamin" value="<?php echo htmlspecialchars(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_START_TEST'), ENT_QUOTES, 'UTF-8'); ?>">
+        <input type="hidden" name="test_started_at" value="<?php echo time(); ?>">
     </form>
     <?php endif; ?>
     <?php if (!$this->started) : ?>
@@ -96,6 +97,7 @@ use Joomla\CMS\Factory;
                 <input type="hidden" name="set_id" value="<?php echo (int) $this->set->id; ?>">
                 <input type="hidden" name="participant_name" value="<?php echo htmlspecialchars(Factory::getApplication()->getInput()->post->getString('participant_name', ''), ENT_QUOTES, 'UTF-8'); ?>">
                 <input type="hidden" name="extra_time" value="<?php echo (int) $extraTime; ?>">
+                <input type="hidden" name="test_started_at" value="<?php echo (int) Factory::getApplication()->getInput()->post->getInt('test_started_at', time()); ?>">
                 <input type="hidden" name="task" value="check">
                 <?php echo \Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
                 <?php if (!$this->results) : ?>