Stack result filters vertically

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

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

@@ -74,7 +74,13 @@ COM_TESTQUESTIONS_RESULT_EXECUTION_TIME="Czas wykonania"
 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_RESULTS_TEST_NAME="Nazwa testu"
+COM_TESTQUESTIONS_RESULTS_ALL_TESTS="Wszystkie zestawy"
+COM_TESTQUESTIONS_RESULTS_DATE_FROM="Data od"
+COM_TESTQUESTIONS_RESULTS_DATE_TO="Data do"
 COM_TESTQUESTIONS_YOUR_ANSWER="Twoja odpowiedź"
 COM_TESTQUESTIONS_SELECTED_ANSWER="Zaznaczona odpowiedź"
 COM_TESTQUESTIONS_ANSWER_CORRECT="Poprawna 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.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/sql/updates/mysql/1.30.0.sql

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

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

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

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

@@ -0,0 +1 @@
+-- No database changes required for version 1.32.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/ResultsModel.php

@@ -13,6 +13,9 @@ class ResultsModel extends ListModel
     {
         parent::populateState($ordering, $direction);
         $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+        $this->setState('filter.set_id', $this->getUserStateFromRequest($this->context . '.filter.set_id', 'filter_set_id', 0, 'int'));
+        $this->setState('filter.date_from', $this->getUserStateFromRequest($this->context . '.filter.date_from', 'filter_date_from', '', 'string'));
+        $this->setState('filter.date_to', $this->getUserStateFromRequest($this->context . '.filter.date_to', 'filter_date_to', '', 'string'));
     }
 
     protected function getListQuery()
@@ -30,6 +33,34 @@ class ResultsModel extends ListModel
             $query->where('(r.participant_name LIKE ' . $needle . ' OR s.title LIKE ' . $needle . ')');
         }
 
+        $setId = (int) $this->getState('filter.set_id');
+        if ($setId > 0) {
+            $query->where('r.set_id = ' . $setId);
+        }
+
+        $dateFrom = (string) $this->getState('filter.date_from');
+        if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $dateFrom)) {
+            $query->where('r.created >= ' . $db->quote($dateFrom . ' 00:00:00'));
+        }
+
+        $dateTo = (string) $this->getState('filter.date_to');
+        if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $dateTo)) {
+            $query->where('r.created <= ' . $db->quote($dateTo . ' 23:59:59'));
+        }
+
         return $query->order('r.created DESC, r.id DESC');
     }
+
+    public function getSets(): array
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['s.id', 's.title', 's.published', 'sub.title AS subject_title'])
+                ->from($db->quoteName('#__testquestions_sets', 's'))
+                ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
+                ->order('sub.title ASC, s.title ASC, s.id ASC')
+        )->loadObjectList();
+    }
 }

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/src/View/Results/HtmlView.php

@@ -14,12 +14,14 @@ class HtmlView extends BaseHtmlView
     protected $items;
     protected $pagination;
     protected $state;
+    protected $sets;
 
     public function display($tpl = null)
     {
         $this->items = $this->get('Items');
         $this->pagination = $this->get('Pagination');
         $this->state = $this->get('State');
+        $this->sets = $this->get('Sets');
         ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULTS'));
         ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
 

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,7 +27,6 @@
                 <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>
             <?php if (empty($answer['correct'])) : ?>
@@ -44,7 +43,6 @@
             <?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

@@ -10,7 +10,28 @@ use Joomla\CMS\Router\Route;
         <div class="col-md-6">
             <input type="text" name="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="form-control" placeholder="<?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_SEARCH')); ?>">
         </div>
-        <div class="col-md-3"><button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button></div>
+    </div>
+    <div class="row mb-3">
+        <div class="col-md-6">
+            <label for="filter-set-id" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_TEST_NAME'); ?></label>
+            <select name="filter_set_id" id="filter-set-id" class="form-select">
+                <option value="0"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_ALL_TESTS'); ?></option>
+                <?php foreach ($this->sets as $set) : ?>
+                    <option value="<?php echo (int) $set->id; ?>" <?php echo (int) $this->state->get('filter.set_id') === (int) $set->id ? 'selected' : ''; ?>><?php echo $this->escape(($set->subject_title ? $set->subject_title . ' — ' : '') . $set->title . (!(int) $set->published ? ' (nieopublikowany)' : '')); ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+    </div>
+    <div class="row mb-3">
+        <div class="col-md-3">
+            <label for="filter-date-from" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_DATE_FROM'); ?></label>
+            <input type="date" name="filter_date_from" id="filter-date-from" value="<?php echo $this->escape($this->state->get('filter.date_from')); ?>" class="form-control">
+        </div>
+        <div class="col-md-3">
+            <label for="filter-date-to" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_DATE_TO'); ?></label>
+            <input type="date" name="filter_date_to" id="filter-date-to" value="<?php echo $this->escape($this->state->get('filter.date_to')); ?>" class="form-control">
+        </div>
+        <div class="col-md-3 align-self-end"><button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button></div>
     </div>
     <table class="table table-striped">
         <thead><tr>
@@ -25,7 +46,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.24.0</version>
+    <version>1.32.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,
         ];
     }