Move result save button to top

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.21.0).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.26.0).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

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

@@ -71,7 +71,7 @@ COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER="Punkty przed / po korekcie"
 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_AWARDED_POINTS="Uznane punkty (maksymalnie %s)"
 COM_TESTQUESTIONS_RESULT_COMMENT="Komentarz"
 COM_TESTQUESTIONS_RESULT_SAVED="Dane wyniku zostały zapisane."
 COM_TESTQUESTIONS_RESULTS_SEARCH="Szukaj po użytkowniku lub zestawie..."

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

@@ -0,0 +1 @@
+-- Corrected points are calculated as automatic points plus manually awarded correction points.

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

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

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

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

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

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

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

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

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

@@ -52,21 +52,22 @@ class ResultModel extends BaseDatabaseModel
 
         foreach ($item->answers as $questionId => &$answer) {
             $key = (string) $questionId;
-            $answer['awarded_points'] = max(0, (int) ($awardedPoints[$key] ?? 0));
+            $maxPoints = (int) ($item->questions[(int) $questionId]->points ?? 0);
+            $answer['awarded_points'] = min($maxPoints, max(0, (int) ($awardedPoints[$key] ?? 0)));
             $answer['comment'] = trim((string) ($comments[$key] ?? ''));
         }
         unset($answer);
 
-        $pointsAfter = 0;
+        $correctionPoints = 0;
         foreach ($item->answers as $answer) {
-            $pointsAfter += (int) ($answer['awarded_points'] ?? 0);
+            $correctionPoints += (int) ($answer['awarded_points'] ?? 0);
         }
 
         $db = Factory::getContainer()->get('DatabaseDriver');
         $row = (object) [
             'id' => $id,
             'answers' => json_encode($item->answers, JSON_UNESCAPED_UNICODE),
-            'points_after' => $pointsAfter,
+            'points_after' => (int) $item->points_before + $correctionPoints,
         ];
 
         return (bool) $db->updateObject('#__testquestions_results', $row, 'id');

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

@@ -11,11 +11,14 @@
         <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_POINTS_BEFORE_AFTER'); ?></dt>
+        <dd class="col-sm-9"><?php echo (int) $this->item->points_before; ?> / <?php echo (int) $this->item->points_after; ?></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>
+    <button type="submit" class="btn btn-primary mb-3"><?php echo \Joomla\CMS\Language\Text::_('JSAVE'); ?></button>
     <?php foreach ($this->item->answers as $questionId => $answer) : ?>
         <?php $question = $this->item->questions[(int) $questionId] ?? null; if (!$question) continue; ?>
         <article class="mb-4 border rounded p-3">
@@ -25,22 +28,22 @@
                 <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_PATTERN'); ?>:</strong> <?php echo htmlspecialchars($question->answer_open, ENT_QUOTES, 'UTF-8'); ?></div>
             <?php else : ?>
                 <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECTED_ANSWER'); ?>:</strong> <?php echo $answer['selected'] ? chr(64 + (int) $answer['selected']) : '—'; ?></div>
-                <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">
+            <?php if (empty($answer['correct'])) : ?>
-                <div class="col-md-3">
+                <div class="row mt-3">
-                    <label for="awarded-points-<?php echo (int) $questionId; ?>" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_AWARDED_POINTS'); ?></label>
+                    <div class="col-md-3">
-                    <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); ?>">
+                        <label for="awarded-points-<?php echo (int) $questionId; ?>" class="form-label"><?php echo \Joomla\CMS\Language\Text::sprintf('COM_TESTQUESTIONS_RESULT_AWARDED_POINTS', (int) ($question->points ?? 0)); ?></label>
+                        <input type="number" min="0" max="<?php echo (int) ($question->points ?? 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>
-                <div class="col-md-9">
+            <?php endif; ?>
-                    <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'); ?>

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