Show percentages for original and corrected points

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

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

@@ -71,9 +71,11 @@ 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_RESULT_SAVE="Zapisz"
+COM_TESTQUESTIONS_RESULT_SAVE_AND_CLOSE="Zapisz i zamknij"
 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

@@ -84,6 +84,7 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_results` (
   `correct_count` smallint unsigned NOT NULL DEFAULT 0,
   `total_count` smallint unsigned NOT NULL DEFAULT 0,
   `percentage` decimal(5,2) NOT NULL DEFAULT 0.00,
+  `points_total` int unsigned NOT NULL DEFAULT 0,
   `points_before` int unsigned NOT NULL DEFAULT 0,
   `points_after` int unsigned NOT NULL DEFAULT 0,
   `answers` longtext NULL,

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/sql/updates/mysql/1.27.0.sql

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

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

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

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

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

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

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

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

@@ -0,0 +1,6 @@
+ALTER TABLE `#__testquestions_results`
+  ADD COLUMN `points_total` int unsigned NOT NULL DEFAULT 0 AFTER `percentage`;
+
+UPDATE `#__testquestions_results`
+SET `points_total` = `total_count`
+WHERE `points_total` = 0;

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

@@ -13,6 +13,26 @@ use Joomla\CMS\Session\Session;
 class ResultController extends BaseController
 {
     public function save(): void
+    {
+        $this->saveAssessment();
+        $id = Factory::getApplication()->getInput()->post->getInt('id');
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=result&id=' . $id, false),
+            Text::_('COM_TESTQUESTIONS_RESULT_SAVED')
+        );
+    }
+
+    public function save2close(): void
+    {
+        $this->saveAssessment();
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=results', false),
+            Text::_('COM_TESTQUESTIONS_RESULT_SAVED')
+        );
+    }
+
+    private function saveAssessment(): void
     {
         if (!Session::checkToken()) {
             throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
@@ -27,10 +47,5 @@ class ResultController extends BaseController
         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

@@ -52,7 +52,8 @@ 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);

administrator/components/com_testquestions/src/View/Result/HtmlView.php

@@ -21,6 +21,8 @@ class HtmlView extends BaseHtmlView
         }
 
         ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULT_PREVIEW'));
+        ToolbarHelper::save('result.save', 'COM_TESTQUESTIONS_RESULT_SAVE');
+        ToolbarHelper::custom('result.save2close', 'save', 'save', 'COM_TESTQUESTIONS_RESULT_SAVE_AND_CLOSE', false);
         ToolbarHelper::link('index.php?option=com_testquestions&view=results', 'COM_TESTQUESTIONS_RESULTS', 'back');
 
         return parent::display($tpl);

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

@@ -16,7 +16,7 @@
         <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">
+    <form action="<?php echo Route::_('index.php?option=com_testquestions&view=result&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm">
     <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; ?>
@@ -27,22 +27,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">
-                <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); ?>">
+            <?php if (empty($answer['correct'])) : ?>
+                <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::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">
-                    <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>
+            <?php endif; ?>
         </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'); ?>

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

@@ -25,7 +25,10 @@ use Joomla\CMS\Router\Route;
             <tr class="<?php echo (int) $item->extra_time > 0 ? 'table-warning' : ''; ?>">
                 <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->points_before; ?> / <?php echo (int) $item->points_after; ?></td>
+                <?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; ?>
+                <td><?php echo (int) $item->points_before; ?> (<?php echo $pointsBeforePercentage; ?>%) / <?php echo (int) $item->points_after; ?> (<?php echo $pointsAfterPercentage; ?>%)</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>

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.22.0</version>
+    <version>1.29.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

@@ -82,7 +82,9 @@ class SetModel extends BaseDatabaseModel
         }
 
         $pointsBefore = 0;
+        $pointsTotal = 0;
         foreach (($result['items'] ?? []) as $item) {
+            $pointsTotal += (int) ($item['points'] ?? 0);
             if (!empty($item['correct'])) {
                 $pointsBefore += (int) ($item['points'] ?? 0);
             }
@@ -97,6 +99,7 @@ class SetModel extends BaseDatabaseModel
             'correct_count' => (int) ($result['correct'] ?? 0),
             'total_count' => (int) ($result['total'] ?? 0),
             'percentage' => (float) ($result['percentage'] ?? 0),
+            'points_total' => $pointsTotal,
             'points_before' => $pointsBefore,
             'points_after' => $pointsBefore,
             'answers' => json_encode($result['items'] ?? [], JSON_UNESCAPED_UNICODE),

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

@@ -85,6 +85,9 @@ class HtmlView extends BaseHtmlView
             'items' => $results,
             'correct' => $correct,
             'total' => count($items),
+            'points_total' => array_sum(array_map(static function ($item) {
+                return (int) ($item->points ?? 0);
+            }, $items)),
             'percentage' => count($items) ? round(($correct / count($items)) * 100, 2) : 0,
         ];
     }