Label submitted open answer

README.md

@@ -12,6 +12,7 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - przełącznik widoku listy: same pytania albo pytania z odpowiedziami,
 - frontendowy widok pytań filtrowany po symbolu arkusza egzaminacyjnego,
 - frontendowy widok testu na podstawie wybranego zestawu pytań,
+- dwuetapowe rozpoczęcie testu z loginem użytkownika i możliwością przedłużenia czasu,
 - 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,
@@ -25,6 +26,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.14.0).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.15.2).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

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

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

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

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

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

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

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

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

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.14.0</version>
+    <version>1.15.2</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

@@ -19,3 +19,10 @@ COM_TESTQUESTIONS_MENU_TEST_SYMBOL_DESC="Opcjonalnie wybierz symbol arkusza, kt
 COM_TESTQUESTIONS_ENTER_ANSWER="Wpisz odpowiedź"
 COM_TESTQUESTIONS_SET_DURATION="Czas trwania testu"
 COM_TESTQUESTIONS_SET_NOT_FOUND="Nie znaleziono wybranego zestawu testowego."
+COM_TESTQUESTIONS_SELECT_SET="Wybierz zestaw pytań"
+COM_TESTQUESTIONS_SHOW_SET="Pokaż zestaw"
+COM_TESTQUESTIONS_YOUR_ANSWER="Twoja odpowiedź"
+COM_TESTQUESTIONS_PARTICIPANT_NAME="Login lub nazwa użytkownika"
+COM_TESTQUESTIONS_EXTRA_TIME="Przedłużenie czasu"
+COM_TESTQUESTIONS_START_TEST="Rozpocznij test"
+COM_TESTQUESTIONS_SET_START_HINT="Wybierz zestaw, wpisz login lub nazwę użytkownika i zatwierdź rozpoczęcie testu."

components/com_testquestions/src/Model/SetModel.php

@@ -56,4 +56,18 @@ class SetModel extends BaseDatabaseModel
                 ->order('sq.ordering ASC, q.id ASC')
         )->loadObjectList();
     }
+
+    public function getSets()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['s.id', 's.title', 'sub.title AS subject_title'])
+                ->from($db->quoteName('#__testquestions_sets', 's'))
+                ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
+                ->where('s.published = 1')
+                ->order('sub.title ASC, s.title ASC')
+        )->loadObjectList();
+    }
 }

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

@@ -11,12 +11,23 @@ class HtmlView extends BaseHtmlView
 {
     protected $set;
     protected $items;
+    protected $sets;
     protected $results;
+    protected $started;
 
     public function display($tpl = null)
     {
+        $this->getDocument()->getWebAssetManager()->registerAndUseStyle(
+            'com_testquestions.exam',
+            'media/com_testquestions/egzamin.css'
+        );
         $this->set = $this->get('Set');
         $this->items = $this->get('Items');
+        $this->sets = $this->get('Sets');
+        $input = Factory::getApplication()->getInput();
+        $this->started = $input->getMethod() === 'POST'
+            && $input->post->getString('participant_name', '') !== ''
+            && $input->post->getInt('set_id', 0) > 0;
         $this->results = $this->buildResults($this->items);
 
         return parent::display($tpl);

components/com_testquestions/tmpl/set/default.php

@@ -1,15 +1,48 @@
 <?php
 
 defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
 ?>
 <div class="com-testquestions egzamin">
-    <?php if (!$this->set) : ?>
+    <?php if (!$this->started) : ?>
+    <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="post" class="mb-4">
+        <label for="test-set" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECT_SET'); ?></label>
+        <div class="input-group">
+            <select id="test-set" name="set_id" class="form-select egzamin" required>
+                <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SELECT_SET'); ?></option>
+                <?php foreach ($this->sets as $set) : ?>
+                    <option value="<?php echo (int) $set->id; ?>" <?php echo $this->set && (int) $this->set->id === (int) $set->id ? 'selected' : ''; ?>><?php echo htmlspecialchars(($set->subject_title ? $set->subject_title . ' — ' : '') . $set->title, ENT_QUOTES, 'UTF-8'); ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+        <div class="mt-3">
+            <label for="participant-name" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_PARTICIPANT_NAME'); ?></label>
+            <input type="text" id="participant-name" name="participant_name" class="form-control" required>
+        </div>
+        <div class="mt-3">
+            <label for="extra-time" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_EXTRA_TIME'); ?></label>
+            <select id="extra-time" name="extra_time" class="form-select" >
+                <option value="0">0 min</option>
+                <option value="5">5 min</option>
+                <option value="10">10 min</option>
+                <option value="15">15 min</option>
+                <option value="30">30 min</option>
+            </select>
+        </div>
+        <input type="submit" class="egzamin" value="<?php echo htmlspecialchars(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_START_TEST'), ENT_QUOTES, 'UTF-8'); ?>">
+    </form>
+    <?php endif; ?>
+    <?php if (!$this->started) : ?>
+        <?php if (!$this->set && $this->sets) : ?><div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_START_HINT'); ?></div><?php endif; ?>
+    <?php elseif (!$this->set) : ?>
         <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_NOT_FOUND'); ?></div>
     <?php else : ?>
         <header class="test-set-header">
             <?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 ((int) $this->set->duration > 0) : ?><div class="small text-muted"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_DURATION'); ?>: <?php echo (int) $this->set->duration; ?> min</div><?php endif; ?>
+            <?php $extraTime = Factory::getApplication()->getInput()->post->getInt('extra_time', 0); ?>
+            <?php if ((int) $this->set->duration > 0) : ?><div class="small text-muted"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_DURATION'); ?>: <?php echo (int) $this->set->duration + $extraTime; ?> min</div><?php endif; ?>
             <?php if ($this->set->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($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>
@@ -24,8 +57,13 @@ defined('_JEXEC') or die;
                     <?php if ($item->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($item->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
                     <?php if ($item->question_type === 'open') : ?>
                         <div class="<?php echo $this->results ? ($this->results['items'][$item->id]['correct'] ? 'odpup' : 'odpu') : 'odp'; ?>">
-                            <label for="set-answer-<?php echo (int) $number; ?>"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ENTER_ANSWER'); ?></label>
+                            <?php if ($this->results) : ?>
-                            <input type="text" id="set-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') : ''; ?>">
+                                <strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_YOUR_ANSWER'); ?>:</strong>
+                                <?php echo htmlspecialchars($this->results['items'][$item->id]['selected'] ?: '—', ENT_QUOTES, 'UTF-8'); ?>
+                            <?php else : ?>
+                                <label for="set-answer-<?php echo (int) $number; ?>"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ENTER_ANSWER'); ?></label>
+                                <input type="text" id="set-answer-<?php echo (int) $number; ?>" name="answers[<?php echo (int) $item->id; ?>]" class="form-control">
+                            <?php endif; ?>
                         </div>
                     <?php else : ?>
                         <ol type="A" class="answer-list">
@@ -47,9 +85,13 @@ defined('_JEXEC') or die;
                 </article>
             <?php endforeach; ?>
                 <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="task" value="check">
                 <?php echo \Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
-                <input type="submit" class="egzamin" value="<?php echo htmlspecialchars(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FINISH_TEST'), ENT_QUOTES, 'UTF-8'); ?>">
+                <?php if (!$this->results) : ?>
+                    <input type="submit" class="egzamin" value="<?php echo htmlspecialchars(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FINISH_TEST'), ENT_QUOTES, 'UTF-8'); ?>">
+                <?php endif; ?>
             </form>
         <?php endif; ?>
     <?php endif; ?>