Add frontend test scoring

README.md

@@ -13,6 +13,7 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - frontendowy widok pytań filtrowany po symbolu arkusza egzaminacyjnego,
 - 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,
 - opcjonalny symbol testu, rok egzaminu i numer pytania z arkusza,
 - wskazanie poprawnej odpowiedzi,
 - opcjonalne zdjęcie wybierane z Media Managera,
@@ -21,6 +22,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.6.3).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.7.0).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

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

@@ -0,0 +1 @@
+-- Add client-side test completion and result calculation.

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

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

@@ -6,6 +6,13 @@ COM_TESTQUESTIONS_NO_TEST_QUESTIONS="Nie znaleziono pytań dla podanego arkusza.
 COM_TESTQUESTIONS_TEST_SHEET="Arkusz"
 COM_TESTQUESTIONS_TIME_LIMIT="Czas"
 COM_TESTQUESTIONS_POINTS="Punkty"
+COM_TESTQUESTIONS_FINISH_TEST="Zakończ test"
+COM_TESTQUESTIONS_RESULT="Wynik"
+COM_TESTQUESTIONS_ANSWER_CORRECT="Poprawna odpowiedź"
+COM_TESTQUESTIONS_ANSWER_INCORRECT="Niepoprawna odpowiedź"
+COM_TESTQUESTIONS_CORRECT_ANSWER="Poprawna odpowiedź"
+COM_TESTQUESTIONS_CORRECT_PATTERN="Wzorzec poprawnej odpowiedzi"
+COM_TESTQUESTIONS_SELECTED_ANSWER="Zaznaczona odpowiedź"
 COM_TESTQUESTIONS_MENU_ITEM_TITLE="Arkusz egzaminacyjny"
 COM_TESTQUESTIONS_MENU_ITEM_DESCRIPTION="Wyświetla pytania z wybranego arkusza egzaminacyjnego."
 COM_TESTQUESTIONS_MENU_TEST_SYMBOL_DESC="Opcjonalnie wybierz symbol arkusza, który ma być wyświetlany po wejściu z menu."

components/com_testquestions/src/Controller/DisplayController.php

@@ -5,8 +5,18 @@ namespace Komponent\Component\Testquestions\Site\Controller;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Session\Session;
 
 class DisplayController extends BaseController
 {
     protected $default_view = 'questions';
+
+    public function check()
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException('Invalid token', 403);
+        }
+
+        return $this->display();
+    }
 }

components/com_testquestions/src/Model/QuestionsModel.php

@@ -22,7 +22,7 @@ class QuestionsModel extends ListModel
     {
         $db = Factory::getContainer()->get('DatabaseDriver');
         $query = $db->getQuery(true)
-            ->select(['question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'image', 'time_limit', 'points'])
+            ->select(['id', 'test_symbol', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'image', 'time_limit', 'points'])
             ->from($db->quoteName('#__testquestions_questions'))
             ->where($db->quoteName('published') . ' = 1')
             ->order($db->quoteName('ordering') . ' ASC, ' . $db->quoteName('id') . ' ASC');

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

@@ -5,12 +5,14 @@ namespace Komponent\Component\Testquestions\Site\View\Questions;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Factory;
 
 class HtmlView extends BaseHtmlView
 {
     protected $items;
     protected $symbol;
     protected $symbols;
+    protected $results;
 
     public function formatSheetLabel($sheet)
     {
@@ -43,6 +45,53 @@ class HtmlView extends BaseHtmlView
         $this->items = $this->get('Items');
         $this->symbol = $this->get('State')->get('filter.test_symbol');
         $this->symbols = $this->get('TestSymbols');
+        $this->results = $this->buildResults($this->items);
         return parent::display($tpl);
     }
+
+    protected function buildResults(array $items)
+    {
+        $input = Factory::getApplication()->getInput();
+
+        if ($input->getCmd('task') !== 'check' || $input->getMethod() !== 'POST') {
+            return null;
+        }
+
+        $answers = (array) $input->post->get('answers', [], 'array');
+        $results = [];
+        $correct = 0;
+
+        foreach ($items as $item) {
+            $selected = isset($answers[$item->id]) ? trim((string) $answers[$item->id]) : '';
+            $isCorrect = false;
+
+            if ($item->question_type === 'open') {
+                $patterns = preg_split('/\s*\|\s*/', (string) $item->answer_open, -1, PREG_SPLIT_NO_EMPTY);
+                foreach ($patterns as $pattern) {
+                    if (mb_strtolower(trim($pattern), 'UTF-8') === mb_strtolower($selected, 'UTF-8')) {
+                        $isCorrect = true;
+                        break;
+                    }
+                }
+            } else {
+                $isCorrect = (string) $item->correct_answer === $selected;
+            }
+
+            if ($isCorrect) {
+                $correct++;
+            }
+
+            $results[$item->id] = [
+                'selected' => $selected,
+                'correct' => $isCorrect,
+            ];
+        }
+
+        return [
+            'items' => $results,
+            'correct' => $correct,
+            'total' => count($items),
+            'percentage' => count($items) ? round(($correct / count($items)) * 100, 2) : 0,
+        ];
+    }
 }

components/com_testquestions/tmpl/questions/default.php

@@ -23,8 +23,17 @@ use Joomla\CMS\HTML\HTMLHelper;
         <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECT_TEST_SYMBOL'); ?></div>
     <?php elseif ($this->symbol !== '') : ?>
         <h2><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_TEST_SHEET'); ?>: <?php echo htmlspecialchars($this->symbol, ENT_QUOTES, 'UTF-8'); ?></h2>
+        <?php if ($this->results) : ?>
+            <div class="alert alert-success">
+                <strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT'); ?>:</strong>
+                <?php echo (int) $this->results['correct']; ?> / <?php echo (int) $this->results['total']; ?>
+                (<?php echo htmlspecialchars((string) $this->results['percentage'], ENT_QUOTES, 'UTF-8'); ?>%)
+            </div>
+        <?php endif; ?>
     <?php endif; ?>
 
+    <?php if ($this->items) : ?>
+    <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="post">
     <?php foreach ($this->items as $number => $item) : ?>
         <article class="testquestion mb-4">
             <h2><?php echo ($number + 1) . '. '; ?><?php echo $item->question; ?></h2>
@@ -37,15 +46,42 @@ use Joomla\CMS\HTML\HTMLHelper;
             </p>
             <?php if ($item->question_type === 'open') : ?>
                 <label for="answer-<?php echo (int) $number; ?>"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ENTER_ANSWER'); ?></label>
-                <input type="text" id="answer-<?php echo (int) $number; ?>" name="answers[<?php echo (int) $number; ?>]" class="form-control">
+                <input type="text" id="answer-<?php echo (int) $number; ?>" name="answers[<?php echo (int) $item->id; ?>]" class="form-control" value="<?php echo $this->results ? htmlspecialchars($this->results['items'][$item->id]['selected'], ENT_QUOTES, 'UTF-8') : ''; ?>">
             <?php else : ?>
-            <ol type="A">
+            <ol type="A" class="list-unstyled">
-                <li><?php echo $item->answer_a; ?></li>
+                <?php foreach (['answer_a', 'answer_b', 'answer_c', 'answer_d'] as $answerIndex => $answerField) : ?>
-                <li><?php echo $item->answer_b; ?></li>
+                    <?php $isSelected = $this->results && $this->results['items'][$item->id]['selected'] === (string) ($answerIndex + 1); ?>
-                <li><?php echo $item->answer_c; ?></li>
+                    <?php $isCorrectAnswer = $this->results && (string) $item->correct_answer === (string) ($answerIndex + 1); ?>
-                <li><?php echo $item->answer_d; ?></li>
+                    <li class="mb-2">
+                        <label>
+                            <input type="radio" name="answers[<?php echo (int) $item->id; ?>]" value="<?php echo $answerIndex + 1; ?>" <?php echo $isSelected ? 'checked' : ''; ?>>
+                            <strong><?php echo chr(65 + $answerIndex); ?>.</strong> <?php echo $item->$answerField; ?>
+                            <?php if ($isSelected) : ?>
+                                <span class="badge bg-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECTED_ANSWER'); ?></span>
+                            <?php endif; ?>
+                            <?php if ($isCorrectAnswer) : ?>
+                                <span class="badge bg-success"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_ANSWER'); ?></span>
+                            <?php endif; ?>
+                        </label>
+                    </li>
+                <?php endforeach; ?>
             </ol>
             <?php endif; ?>
+            <?php if ($this->results) : ?>
+                <div class="mt-2 <?php echo $this->results['items'][$item->id]['correct'] ? 'text-success' : 'text-danger'; ?>">
+                    <?php echo $this->results['items'][$item->id]['correct'] ? '✓ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_CORRECT') : '✗ ' . \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_INCORRECT'); ?>
+                    <?php if ($item->question_type === 'closed') : ?>
+                        — <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_ANSWER'); ?>: <?php echo chr(64 + (int) $item->correct_answer); ?>
+                    <?php else : ?>
+                        — <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_CORRECT_PATTERN'); ?>: <?php echo htmlspecialchars($item->answer_open, ENT_QUOTES, 'UTF-8'); ?>
+                    <?php endif; ?>
+                </div>
+            <?php endif; ?>
         </article>
     <?php endforeach; ?>
+        <input type="hidden" name="task" value="check">
+        <?php echo \Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
+        <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FINISH_TEST'); ?></button>
+    </form>
+    <?php endif; ?>
 </div>