Add result list date and test filters

README.md

@@ -9,14 +9,27 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - edytor formatowania treści pytania i odpowiedzi zamkniętych,
 - czas odpowiedzi, punktacja 1–9 oraz zarządzalne kategorie pytań,
 - filtrowanie listy pytań po kategorii,
+- 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,
+- zegar odliczający czas testu i automatyczne zakończenie po jego upływie,
+- zapisywanie wyników testów i zaznaczonych odpowiedzi w bazie danych,
+- podgląd zapisanych testów w panelu administratora,
+- zapisywanie i wyświetlanie czasu wykonania testu,
+- 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,
 - publikowanie, filtrowanie i usuwanie pytań w panelu administratora,
+- tworzenie zestawów pytań w panelu administratora i przypisywanie do nich pytań,
+- czas trwania w minutach (suwak), treść i obraz zestawu testowego,
 - tabela `#__testquestions_questions` tworzona podczas instalacji.
 
 ## Instalacja
 
-W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.4.2).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.30.0).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/forms/set.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+    <fieldset name="details">
+        <field name="id" type="hidden" />
+        <field name="title" type="text" label="COM_TESTQUESTIONS_SET_TITLE" required="true" maxlength="255" />
+        <field name="subject_id" type="sql" label="COM_TESTQUESTIONS_SUBJECT" required="true" query="SELECT id, title FROM #__testquestions_subjects WHERE published = 1 ORDER BY title ASC" key_field="id" value_field="title" translate_query="false">
+            <option value="0">COM_TESTQUESTIONS_SELECT_SUBJECT</option>
+        </field>
+        <field name="duration" type="range" label="COM_TESTQUESTIONS_SET_DURATION" description="COM_TESTQUESTIONS_SET_DURATION_DESC" min="0" max="120" step="1" default="0" filter="integer" />
+        <field name="test_content" type="editor" label="COM_TESTQUESTIONS_SET_TEST_CONTENT" buttons="true" filter="safehtml" height="150" />
+        <field name="image" type="media" label="COM_TESTQUESTIONS_SET_IMAGE" directory="images/testquestions" preview="tooltip" />
+        <field name="description" type="textarea" label="COM_TESTQUESTIONS_SET_DESCRIPTION" rows="4" filter="raw" />
+        <field name="published" type="list" label="JSTATUS" default="1">
+            <option value="1">JPUBLISHED</option>
+            <option value="0">JUNPUBLISHED</option>
+        </field>
+    </fieldset>
+</form>

administrator/components/com_testquestions/forms/subject.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+    <fieldset name="details">
+        <field name="id" type="hidden" />
+        <field name="title" type="text" label="COM_TESTQUESTIONS_SUBJECT_TITLE" required="true" maxlength="150" />
+        <field name="published" type="list" label="JSTATUS" default="1">
+            <option value="1">JPUBLISHED</option>
+            <option value="0">JUNPUBLISHED</option>
+        </field>
+    </fieldset>
+</form>

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

@@ -12,6 +12,8 @@ COM_TESTQUESTIONS_FIELD_EXAM_YEAR="Rok egzaminu"
 COM_TESTQUESTIONS_FIELD_QUESTION_NUMBER="Numer pytania"
 COM_TESTQUESTIONS_MANAGE_CATEGORIES="Kategorie"
 COM_TESTQUESTIONS_FILTER_CATEGORY="Wszystkie kategorie"
+COM_TESTQUESTIONS_VIEW_QUESTIONS_ONLY="Same pytania"
+COM_TESTQUESTIONS_VIEW_WITH_ANSWERS="Pytania i odpowiedzi"
 COM_TESTQUESTIONS_CATEGORIES="Kategorie pytań"
 COM_TESTQUESTIONS_CATEGORY_TITLE="Nazwa kategorii"
 COM_TESTQUESTIONS_TYPE_CLOSED="Zamknięte — wybór odpowiedzi"
@@ -43,3 +45,51 @@ COM_TESTQUESTIONS_ERROR_QUESTION_TYPE="Wybierz poprawny typ pytania."
 COM_TESTQUESTIONS_ERROR_OPEN_PATTERN="Dla pytania otwartego wpisz wzorzec poprawnej odpowiedzi."
 COM_TESTQUESTIONS_ERROR_ALL_ANSWERS="Dla pytania zamkniętego uzupełnij wszystkie cztery odpowiedzi."
 COM_TESTQUESTIONS_ERROR_META="Wybierz poprawny czas i liczbę punktów."
+COM_TESTQUESTIONS_SETS="Zestawy pytań"
+COM_TESTQUESTIONS_NEW_SET="Nowy zestaw pytań"
+COM_TESTQUESTIONS_EDIT_SET="Edytuj zestaw pytań"
+COM_TESTQUESTIONS_SET_TITLE="Nazwa zestawu"
+COM_TESTQUESTIONS_SET_DESCRIPTION="Opis zestawu"
+COM_TESTQUESTIONS_SET_QUESTIONS="Pytania w zestawie"
+COM_TESTQUESTIONS_SET_QUESTION_COUNT="Liczba pytań"
+COM_TESTQUESTIONS_SET_SEARCH="Szukaj zestawów..."
+COM_TESTQUESTIONS_SET_CATEGORY_FILTER="Filtruj pytania według kategorii"
+COM_TESTQUESTIONS_SET_ALL_CATEGORIES="Wszystkie kategorie"
+COM_TESTQUESTIONS_UNCATEGORIZED="Bez kategorii"
+COM_TESTQUESTIONS_SET_SHOW_DETAILS="Pokaż odpowiedzi"
+COM_TESTQUESTIONS_SUBJECTS="Przedmioty"
+COM_TESTQUESTIONS_SET_DURATION="Czas trwania testu (minuty)"
+COM_TESTQUESTIONS_SET_DURATION_DESC="Ustaw czas trwania testu w minutach za pomocą suwaka."
+COM_TESTQUESTIONS_SET_TEST_CONTENT="Treść testu"
+COM_TESTQUESTIONS_SET_IMAGE="Obraz testu"
+COM_TESTQUESTIONS_RESULTS="Zapisane testy"
+COM_TESTQUESTIONS_RESULT_PREVIEW="Podgląd zapisanego testu"
+COM_TESTQUESTIONS_RESULT_NOT_FOUND="Nie znaleziono zapisanego testu."
+COM_TESTQUESTIONS_RESULT_PARTICIPANT="Użytkownik"
+COM_TESTQUESTIONS_RESULT_SCORE="Wynik"
+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 (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_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ź"
+COM_TESTQUESTIONS_ANSWER_INCORRECT="Niepoprawna odpowiedź"
+COM_TESTQUESTIONS_CORRECT_PATTERN="Wzorzec poprawnej odpowiedzi"
+COM_TESTQUESTIONS_SUBJECT="Przedmiot"
+COM_TESTQUESTIONS_SUBJECT_TITLE="Nazwa przedmiotu"
+COM_TESTQUESTIONS_NEW_SUBJECT="Nowy przedmiot"
+COM_TESTQUESTIONS_EDIT_SUBJECT="Edytuj przedmiot"
+COM_TESTQUESTIONS_SELECT_SUBJECT="-- wybierz przedmiot --"
+COM_TESTQUESTIONS_FILTER_SUBJECT="Wszystkie przedmioty"
+COM_TESTQUESTIONS_SET_SELECTED_QUESTIONS="Wybrane pytania"
+COM_TESTQUESTIONS_SET_AVAILABLE_QUESTIONS="Pytania do wyboru"

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

@@ -1,2 +1,4 @@
 COM_TESTQUESTIONS="Pytania testowe"
 COM_TESTQUESTIONS_DESCRIPTION="Gromadzenie pytań testowych z czterema odpowiedziami i opcjonalnym zdjęciem."
+COM_TESTQUESTIONS_MENU_ITEM_TITLE="Arkusz egzaminacyjny"
+COM_TESTQUESTIONS_MENU_ITEM_DESCRIPTION="Wyświetla pytania z wybranego arkusza egzaminacyjnego."

administrator/components/com_testquestions/sql/install.mysql.utf8mb4.sql

@@ -37,3 +37,60 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_categories` (
 
 INSERT IGNORE INTO `#__testquestions_categories` (`id`, `title`, `published`, `ordering`)
 VALUES (1, 'Bez kategorii', 1, 0);
+
+CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `subject_id` int unsigned NOT NULL DEFAULT 0,
+  `title` varchar(255) NOT NULL,
+  `duration` smallint unsigned NOT NULL DEFAULT 0,
+  `test_content` text NULL,
+  `image` varchar(1024) NOT NULL DEFAULT '',
+  `description` text NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  `created` datetime NULL DEFAULT NULL,
+  `created_by` int unsigned NOT NULL DEFAULT 0,
+  `modified` datetime NULL DEFAULT NULL,
+  `modified_by` int unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `idx_published` (`published`),
+  KEY `idx_ordering` (`ordering`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `#__testquestions_subjects` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(150) NOT NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `#__testquestions_set_questions` (
+  `set_id` int unsigned NOT NULL,
+  `question_id` int unsigned NOT NULL,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`set_id`, `question_id`),
+  KEY `idx_question_id` (`question_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `#__testquestions_results` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `set_id` int unsigned NOT NULL,
+  `participant_name` varchar(255) NOT NULL DEFAULT '',
+  `started` datetime NULL DEFAULT NULL,
+  `execution_time` int unsigned NOT NULL DEFAULT 0,
+  `extra_time` smallint unsigned NOT NULL DEFAULT 0,
+  `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,
+  `created` datetime NOT NULL,
+  `created_by` int unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `idx_set_id` (`set_id`),
+  KEY `idx_created` (`created`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

administrator/components/com_testquestions/sql/uninstall.mysql.utf8mb4.sql

@@ -1 +1,5 @@
+DROP TABLE IF EXISTS `#__testquestions_set_questions`;
+DROP TABLE IF EXISTS `#__testquestions_sets`;
+DROP TABLE IF EXISTS `#__testquestions_subjects`;
+DROP TABLE IF EXISTS `#__testquestions_results`;
 DROP TABLE IF EXISTS `#__testquestions_questions`;

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

@@ -0,0 +1,11 @@
+CREATE TABLE IF NOT EXISTS `#__testquestions_subjects` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(150) NOT NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+ALTER TABLE `#__testquestions_sets`
+  ADD COLUMN `subject_id` int unsigned NOT NULL DEFAULT 0 AFTER `id`;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,4 @@
+ALTER TABLE `#__testquestions_sets`
+  ADD COLUMN `duration` smallint unsigned NOT NULL DEFAULT 0 AFTER `title`,
+  ADD COLUMN `test_content` text NULL AFTER `duration`,
+  ADD COLUMN `image` varchar(1024) NOT NULL DEFAULT '' AFTER `test_content`;

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,3 @@
+UPDATE `#__testquestions_sets`
+SET `duration` = `duration` * 60
+WHERE `duration` > 0;

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

@@ -0,0 +1,3 @@
+UPDATE `#__testquestions_sets`
+SET `duration` = ROUND(`duration` / 60)
+WHERE `duration` > 0;

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

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

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

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

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

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

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

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

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

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

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.

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,15 @@
+CREATE TABLE IF NOT EXISTS `#__testquestions_results` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `set_id` int unsigned NOT NULL,
+  `participant_name` varchar(255) NOT NULL DEFAULT '',
+  `extra_time` smallint unsigned NOT NULL DEFAULT 0,
+  `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,
+  `answers` longtext NULL,
+  `created` datetime NOT NULL,
+  `created_by` int unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `idx_set_id` (`set_id`),
+  KEY `idx_created` (`created`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

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

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

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

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

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

@@ -0,0 +1,3 @@
+ALTER TABLE `#__testquestions_results`
+  ADD COLUMN `started` datetime NULL DEFAULT NULL AFTER `participant_name`,
+  ADD COLUMN `execution_time` int unsigned NOT NULL DEFAULT 0 AFTER `started`;

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

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

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

@@ -0,0 +1 @@
+-- Per-question awarded points and comments are stored in the existing answers JSON column.

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

@@ -0,0 +1,8 @@
+ALTER TABLE `#__testquestions_results`
+  ADD COLUMN `points_before` int unsigned NOT NULL DEFAULT 0 AFTER `percentage`,
+  ADD COLUMN `points_after` int unsigned NOT NULL DEFAULT 0 AFTER `points_before`;
+
+UPDATE `#__testquestions_results`
+SET `points_before` = `correct_count`,
+    `points_after` = `correct_count`
+WHERE `points_before` = 0 AND `points_after` = 0;

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/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.4.4.sql

@@ -0,0 +1 @@
+-- Administrator list view switch for showing answers.

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

@@ -0,0 +1 @@
+-- Frontend view for displaying questions from a selected exam sheet.

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

@@ -0,0 +1 @@
+-- Add frontend menu item metadata for exam sheet view.

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

@@ -0,0 +1 @@
+-- Ensure frontend menu item language metadata is available.

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

@@ -0,0 +1 @@
+-- Use a selectable list of available exam sheet symbols on the frontend.

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

@@ -0,0 +1 @@
+-- Remove temporary exam seed data from the installer. No data is imported by this release.

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

@@ -0,0 +1 @@
+-- Display formatted exam sheet labels on the frontend.

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

@@ -0,0 +1 @@
+-- Limit exam sheet selection to symbols beginning with E.

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,35 @@
+CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `subject_id` int unsigned NOT NULL DEFAULT 0,
+  `title` varchar(255) NOT NULL,
+  `duration` smallint unsigned NOT NULL DEFAULT 0,
+  `test_content` text NULL,
+  `image` varchar(1024) NOT NULL DEFAULT '',
+  `description` text NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  `created` datetime NULL DEFAULT NULL,
+  `created_by` int unsigned NOT NULL DEFAULT 0,
+  `modified` datetime NULL DEFAULT NULL,
+  `modified_by` int unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `idx_published` (`published`),
+  KEY `idx_ordering` (`ordering`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `#__testquestions_subjects` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(150) NOT NULL,
+  `published` tinyint NOT NULL DEFAULT 1,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `#__testquestions_set_questions` (
+  `set_id` int unsigned NOT NULL,
+  `question_id` int unsigned NOT NULL,
+  `ordering` int NOT NULL DEFAULT 0,
+  PRIMARY KEY (`set_id`, `question_id`),
+  KEY `idx_question_id` (`question_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,51 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Router\Route;
+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);
+        }
+
+        $input = Factory::getApplication()->getInput();
+        $id = $input->post->getInt('id');
+        $points = (array) $input->post->get('awarded_points', [], 'array');
+        $comments = (array) $input->post->get('comments', [], 'array');
+        $model = $this->getModel('Result');
+
+        if (!$model->saveAssessment($id, $points, $comments)) {
+            throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_RESULT_NOT_FOUND'));
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\FormController;
+
+class SetController extends FormController
+{
+    protected $view_item = 'set';
+    protected $view_list = 'sets';
+
+    public function cancel($key = null)
+    {
+        $this->setRedirect('index.php?option=com_testquestions&view=sets');
+
+        return true;
+    }
+}

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

@@ -0,0 +1,17 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\AdminController;
+
+class SetsController extends AdminController
+{
+    protected $text_prefix = 'COM_TESTQUESTIONS';
+
+    public function getModel($name = 'Set', $prefix = 'Administrator', $config = ['ignore_request' => true])
+    {
+        return parent::getModel($name, $prefix, $config);
+    }
+}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\FormController;
+
+class SubjectController extends FormController
+{
+    protected $view_item = 'subject';
+    protected $view_list = 'subjects';
+
+    public function cancel($key = null)
+    {
+        $this->setRedirect('index.php?option=com_testquestions&view=subjects');
+
+        return true;
+    }
+}

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

@@ -0,0 +1,17 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\AdminController;
+
+class SubjectsController extends AdminController
+{
+    protected $text_prefix = 'COM_TESTQUESTIONS';
+
+    public function getModel($name = 'Subject', $prefix = 'Administrator', $config = ['ignore_request' => true])
+    {
+        return parent::getModel($name, $prefix, $config);
+    }
+}

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

@@ -21,6 +21,9 @@ class QuestionsModel extends ListModel
         $this->setState('filter.category_id', $this->getUserStateFromRequest(
             $this->context . '.filter.category_id', 'filter_category_id', '', 'int'
         ));
+        $this->setState('filter.show_answers', $this->getUserStateFromRequest(
+            $this->context . '.filter.show_answers', 'filter_show_answers', '0', 'int'
+        ));
     }
 
     protected function getListQuery()

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

@@ -0,0 +1,75 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+
+class ResultModel extends BaseDatabaseModel
+{
+    public function getItem($pk = null)
+    {
+        $id = (int) ($pk ?: Factory::getApplication()->getInput()->getInt('id'));
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $item = $db->setQuery(
+            $db->getQuery(true)
+                ->select(['r.*', 's.title AS set_title', 'sub.title AS subject_title'])
+                ->from($db->quoteName('#__testquestions_results', 'r'))
+                ->leftJoin($db->quoteName('#__testquestions_sets', 's') . ' ON s.id = r.set_id')
+                ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
+                ->where('r.id = ' . $id)
+        )->loadObject();
+
+        if (!$item) {
+            return null;
+        }
+
+        $item->answers = json_decode((string) $item->answers, true) ?: [];
+        $ids = array_map('intval', array_keys($item->answers));
+        $item->questions = [];
+
+        if ($ids) {
+            $item->questions = $db->setQuery(
+                $db->getQuery(true)
+                    ->select(['id', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'points'])
+                    ->from($db->quoteName('#__testquestions_questions'))
+                    ->where('id IN (' . implode(',', $ids) . ')')
+            )->loadObjectList('id');
+        }
+
+        return $item;
+    }
+
+    public function saveAssessment(int $id, array $awardedPoints, array $comments): bool
+    {
+        $item = $this->getItem($id);
+
+        if (!$item) {
+            return false;
+        }
+
+        foreach ($item->answers as $questionId => &$answer) {
+            $key = (string) $questionId;
+            $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);
+
+        $correctionPoints = 0;
+        foreach ($item->answers as $answer) {
+            $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' => (int) $item->points_before + $correctionPoints,
+        ];
+
+        return (bool) $db->updateObject('#__testquestions_results', $row, 'id');
+    }
+}

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

@@ -0,0 +1,54 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\ListModel;
+
+class ResultsModel extends ListModel
+{
+    protected function populateState($ordering = 'r.created', $direction = 'desc')
+    {
+        parent::populateState($ordering, $direction);
+        $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+        $this->setState('filter.test_name', $this->getUserStateFromRequest($this->context . '.filter.test_name', 'filter_test_name', '', 'string'));
+        $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()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $query = $db->getQuery(true)
+            ->select(['r.*', 's.title AS set_title', 'sub.title AS subject_title'])
+            ->from($db->quoteName('#__testquestions_results', 'r'))
+            ->leftJoin($db->quoteName('#__testquestions_sets', 's') . ' ON s.id = r.set_id')
+            ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id');
+
+        $search = trim((string) $this->getState('filter.search'));
+        if ($search !== '') {
+            $needle = $db->quote('%' . $db->escape($search, true) . '%', false);
+            $query->where('(r.participant_name LIKE ' . $needle . ' OR s.title LIKE ' . $needle . ')');
+        }
+
+        $testName = trim((string) $this->getState('filter.test_name'));
+        if ($testName !== '') {
+            $needle = $db->quote('%' . $db->escape($testName, true) . '%', false);
+            $query->where('s.title LIKE ' . $needle);
+        }
+
+        $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');
+    }
+}

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

@@ -0,0 +1,124 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\AdminModel;
+
+class SetModel extends AdminModel
+{
+    public function getTable($name = 'Set', $prefix = 'Administrator', $config = [])
+    {
+        return $this->getMVCFactory()->createTable($name, $prefix, $config);
+    }
+
+    public function getForm($data = [], $loadData = true)
+    {
+        return $this->loadForm('com_testquestions.set', 'set', ['control' => 'jform', 'load_data' => $loadData]);
+    }
+
+    public function getItem($pk = null)
+    {
+        $item = parent::getItem($pk);
+
+        if ($item && !empty($item->id)) {
+            $db = Factory::getContainer()->get('DatabaseDriver');
+            $item->question_ids = $db->setQuery(
+                $db->getQuery(true)
+                    ->select($db->quoteName('question_id'))
+                    ->from($db->quoteName('#__testquestions_set_questions'))
+                    ->where($db->quoteName('set_id') . ' = ' . (int) $item->id)
+                    ->order($db->quoteName('ordering') . ' ASC')
+            )->loadColumn();
+        } else {
+            $item->question_ids = [];
+        }
+
+        return $item;
+    }
+
+    protected function loadFormData()
+    {
+        return Factory::getApplication()->getUserState('com_testquestions.edit.set.data', []) ?: $this->getItem();
+    }
+
+    public function getQuestions()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['q.id', 'q.question', 'q.question_type', 'q.answer_a', 'q.answer_b', 'q.answer_c', 'q.answer_d', 'q.answer_open', 'q.correct_answer', 'q.category_id', 'c.title AS category_title'])
+                ->from($db->quoteName('#__testquestions_questions', 'q'))
+                ->leftJoin($db->quoteName('#__testquestions_categories', 'c') . ' ON c.id = q.category_id')
+                ->order('c.title ASC, q.ordering ASC, q.id ASC')
+        )->loadObjectList();
+    }
+
+    public function getCategories()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['id', 'title'])
+                ->from($db->quoteName('#__testquestions_categories'))
+                ->order($db->quoteName('title') . ' ASC')
+        )->loadObjectList();
+    }
+
+    public function save($data)
+    {
+        $formData = Factory::getApplication()->getInput()->post->get('jform', [], 'array');
+        $questionIds = array_values(array_unique(array_filter(array_map('intval', (array) ($formData['question_ids'] ?? $data['question_ids'] ?? [])))));
+        unset($data['question_ids']);
+
+        if (!parent::save($data)) {
+            return false;
+        }
+
+        $setId = (int) $this->getState($this->getName() . '.id');
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $db->setQuery(
+            $db->getQuery(true)
+                ->delete($db->quoteName('#__testquestions_set_questions'))
+                ->where($db->quoteName('set_id') . ' = ' . $setId)
+        )->execute();
+
+        if ($questionIds) {
+            $query = $db->getQuery(true)
+                ->insert($db->quoteName('#__testquestions_set_questions'))
+                ->columns([$db->quoteName('set_id'), $db->quoteName('question_id'), $db->quoteName('ordering')]);
+
+            foreach ($questionIds as $ordering => $questionId) {
+                $query->values(implode(',', [$setId, $questionId, $ordering]));
+            }
+
+            $db->setQuery($query)->execute();
+        }
+
+        return true;
+    }
+
+    public function delete(&$pks)
+    {
+        if (!parent::delete($pks)) {
+            return false;
+        }
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $ids = array_map('intval', (array) $pks);
+
+        if ($ids) {
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->delete($db->quoteName('#__testquestions_set_questions'))
+                    ->where($db->quoteName('set_id') . ' IN (' . implode(',', $ids) . ')')
+            )->execute();
+        }
+
+        return true;
+    }
+}

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

@@ -0,0 +1,59 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\ListModel;
+
+class SetsModel extends ListModel
+{
+    protected function populateState($ordering = 's.ordering', $direction = 'asc')
+    {
+        parent::populateState($ordering, $direction);
+        $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+        $this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
+        $this->setState('filter.subject_id', $this->getUserStateFromRequest($this->context . '.filter.subject_id', 'filter_subject_id', '', 'int'));
+    }
+
+    protected function getListQuery()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $query = $db->getQuery(true)
+            ->select(['s.*', 'sub.title AS subject_title', 'COUNT(sq.question_id) AS question_count'])
+            ->from($db->quoteName('#__testquestions_sets', 's'))
+            ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
+            ->leftJoin($db->quoteName('#__testquestions_set_questions', 'sq') . ' ON sq.set_id = s.id')
+            ->group('s.id');
+
+        $search = trim((string) $this->getState('filter.search'));
+        if ($search !== '') {
+            $query->where('s.title LIKE ' . $db->quote('%' . $db->escape($search, true) . '%', false));
+        }
+
+        $published = $this->getState('filter.published');
+        if ($published !== '' && $published !== null) {
+            $query->where('s.published = ' . (int) $published);
+        }
+
+        if ((int) $this->getState('filter.subject_id') > 0) {
+            $query->where('s.subject_id = ' . (int) $this->getState('filter.subject_id'));
+        }
+
+        return $query->order('s.ordering ASC, s.title ASC');
+    }
+
+    public function getSubjects()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['id', 'title'])
+                ->from($db->quoteName('#__testquestions_subjects'))
+                ->where($db->quoteName('published') . ' = 1')
+                ->order($db->quoteName('title') . ' ASC')
+        )->loadObjectList();
+    }
+}

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

@@ -0,0 +1,26 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\AdminModel;
+
+class SubjectModel extends AdminModel
+{
+    public function getTable($name = 'Subject', $prefix = 'Administrator', $config = [])
+    {
+        return $this->getMVCFactory()->createTable($name, $prefix, $config);
+    }
+
+    public function getForm($data = [], $loadData = true)
+    {
+        return $this->loadForm('com_testquestions.subject', 'subject', ['control' => 'jform', 'load_data' => $loadData]);
+    }
+
+    protected function loadFormData()
+    {
+        return Factory::getApplication()->getUserState('com_testquestions.edit.subject.data', []) ?: $this->getItem();
+    }
+}

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

@@ -0,0 +1,21 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\ListModel;
+
+class SubjectsModel extends ListModel
+{
+    protected function getListQuery()
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->getQuery(true)
+            ->select('*')
+            ->from($db->quoteName('#__testquestions_subjects'))
+            ->order($db->quoteName('ordering') . ' ASC, ' . $db->quoteName('title') . ' ASC');
+    }
+}

administrator/components/com_testquestions/src/Table/SetTable.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Table;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Table\Table;
+use Joomla\Database\DatabaseDriver;
+
+class SetTable extends Table
+{
+    public function __construct(DatabaseDriver $db)
+    {
+        parent::__construct('#__testquestions_sets', 'id', $db);
+    }
+
+    public function check($updateNulls = false): bool
+    {
+        $this->title = trim((string) $this->title);
+
+        return $this->title !== '' && parent::check($updateNulls);
+    }
+}

administrator/components/com_testquestions/src/Table/SubjectTable.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Table;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Table\Table;
+use Joomla\Database\DatabaseDriver;
+
+class SubjectTable extends Table
+{
+    public function __construct(DatabaseDriver $db)
+    {
+        parent::__construct('#__testquestions_subjects', 'id', $db);
+    }
+
+    public function check($updateNulls = false): bool
+    {
+        $this->title = trim((string) $this->title);
+
+        return $this->title !== '' && parent::check($updateNulls);
+    }
+}

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

@@ -51,5 +51,17 @@ class HtmlView extends BaseHtmlView
             'COM_TESTQUESTIONS_MANAGE_CATEGORIES',
             'list'
         );
+
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=sets',
+            'COM_TESTQUESTIONS_SETS',
+            'list'
+        );
+
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=results',
+            'COM_TESTQUESTIONS_RESULTS',
+            'list'
+        );
     }
 }

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

@@ -0,0 +1,30 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Result;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $item;
+
+    public function display($tpl = null)
+    {
+        $this->item = $this->get('Item');
+
+        if (!$this->item) {
+            throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_RESULT_NOT_FOUND'));
+        }
+
+        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

@@ -0,0 +1,28 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Results;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $items;
+    protected $pagination;
+    protected $state;
+
+    public function display($tpl = null)
+    {
+        $this->items = $this->get('Items');
+        $this->pagination = $this->get('Pagination');
+        $this->state = $this->get('State');
+        ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULTS'));
+        ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
+
+        return parent::display($tpl);
+    }
+}

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

@@ -0,0 +1,41 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Set;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $form;
+    protected $item;
+    protected $questions;
+    protected $categories;
+
+    public function display($tpl = null)
+    {
+        $this->form = $this->get('Form');
+        $this->item = $this->get('Item');
+        $this->questions = $this->get('Questions');
+        $this->categories = $this->get('Categories');
+
+        if (count($errors = $this->get('Errors'))) {
+            throw new \RuntimeException(implode("\n", $errors));
+        }
+
+        $this->addToolbar();
+
+        return parent::display($tpl);
+    }
+
+    protected function addToolbar()
+    {
+        ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SET') : Text::_('COM_TESTQUESTIONS_NEW_SET'));
+        ToolbarHelper::apply('set.apply', 'JTOOLBAR_APPLY');
+        ToolbarHelper::save('set.save', 'JTOOLBAR_SAVE');
+        ToolbarHelper::cancel('set.cancel', 'JTOOLBAR_CANCEL');
+    }
+}

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

@@ -0,0 +1,66 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Sets;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $items;
+    protected $pagination;
+    protected $state;
+    protected $subjects;
+
+    public function display($tpl = null)
+    {
+        $this->items = $this->get('Items');
+        $this->pagination = $this->get('Pagination');
+        $this->state = $this->get('State');
+        $this->subjects = $this->get('Subjects');
+
+        if (count($errors = $this->get('Errors'))) {
+            throw new \RuntimeException(implode("\n", $errors));
+        }
+
+        $this->addToolbar();
+
+        return parent::display($tpl);
+    }
+
+    protected function addToolbar()
+    {
+        $user = $this->getCurrentUser();
+        $this->getDocument()->setTitle(Text::_('COM_TESTQUESTIONS_SETS'));
+
+        if ($user->authorise('core.create', 'com_testquestions')) {
+            ToolbarHelper::addNew('set.add', 'JTOOLBAR_NEW');
+        }
+        if ($user->authorise('core.edit', 'com_testquestions')) {
+            ToolbarHelper::editList('set.edit', 'JTOOLBAR_EDIT');
+        }
+        if ($user->authorise('core.delete', 'com_testquestions')) {
+            ToolbarHelper::deleteList('', 'sets.delete', 'JTOOLBAR_DELETE');
+        }
+
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=questions',
+            'COM_TESTQUESTIONS_QUESTIONS',
+            'list'
+        );
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=subjects',
+            'COM_TESTQUESTIONS_SUBJECTS',
+            'list'
+        );
+        ToolbarHelper::link(
+            'index.php?option=com_testquestions&view=results',
+            'COM_TESTQUESTIONS_RESULTS',
+            'list'
+        );
+    }
+}

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

@@ -0,0 +1,28 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Subject;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $form;
+    protected $item;
+
+    public function display($tpl = null)
+    {
+        $this->form = $this->get('Form');
+        $this->item = $this->get('Item');
+        ToolbarHelper::title($this->item->id ? Text::_('COM_TESTQUESTIONS_EDIT_SUBJECT') : Text::_('COM_TESTQUESTIONS_NEW_SUBJECT'));
+        ToolbarHelper::apply('subject.apply', 'JTOOLBAR_APPLY');
+        ToolbarHelper::save('subject.save', 'JTOOLBAR_SAVE');
+        ToolbarHelper::save2new('subject.save2new', 'JTOOLBAR_SAVE_AND_NEW');
+        ToolbarHelper::cancel('subject.cancel', 'JTOOLBAR_CANCEL');
+
+        return parent::display($tpl);
+    }
+}

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

@@ -0,0 +1,27 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Subjects;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $items;
+
+    public function display($tpl = null)
+    {
+        $this->items = $this->get('Items');
+        ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_SUBJECTS'));
+        ToolbarHelper::addNew('subject.add', 'JTOOLBAR_NEW');
+        ToolbarHelper::editList('subject.edit', 'JTOOLBAR_EDIT');
+        ToolbarHelper::deleteList('', 'subjects.delete', 'JTOOLBAR_DELETE');
+        ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
+
+        return parent::display($tpl);
+    }
+}

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

@@ -29,6 +29,12 @@ HTMLHelper::_('behavior.multiselect');
                 <?php endforeach; ?>
             </select>
         </div>
+        <div class="col-md-2">
+            <select name="filter_show_answers" class="form-select" onchange="this.form.submit();">
+                <option value="0" <?php echo (int) $this->state->get('filter.show_answers') === 0 ? 'selected' : ''; ?>><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_VIEW_QUESTIONS_ONLY'); ?></option>
+                <option value="1" <?php echo (int) $this->state->get('filter.show_answers') === 1 ? 'selected' : ''; ?>><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_VIEW_WITH_ANSWERS'); ?></option>
+            </select>
+        </div>
         <div class="col-md-2">
             <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button>
             <a href="<?php echo Route::_('index.php?option=com_testquestions&view=questions'); ?>" class="btn btn-secondary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_CLEAR'); ?></a>
@@ -41,8 +47,6 @@ HTMLHelper::_('behavior.multiselect');
             <tr>
                 <th scope="col" class="w-1"><?php echo HTMLHelper::_('grid.checkall'); ?></th>
                 <th scope="col"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_QUESTION'); ?></th>
-                <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_TYPE'); ?></th>
-                <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_CORRECT'); ?></th>
                 <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('JSTATUS'); ?></th>
                 <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_ID'); ?></th>
             </tr>
@@ -56,9 +60,19 @@ HTMLHelper::_('behavior.multiselect');
                         <?php echo $this->escape(strip_tags($item->question)); ?>
                     </a>
                     <?php if ($item->image) : ?><span class="icon-image ms-2" title="<?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_HAS_IMAGE'); ?>"></span><?php endif; ?>
+                    <?php if ((int) $this->state->get('filter.show_answers') === 1) : ?>
+                        <div class="mt-2 ps-3 border-start">
+                            <?php if ($item->question_type === 'open') : ?>
+                                <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FIELD_OPEN_PATTERN'); ?>:</strong> <?php echo $item->answer_open; ?></div>
+                            <?php else : ?>
+                                <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">A:</strong><span><?php echo $item->answer_a; ?></span><?php if ((int) $item->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><span><?php echo $item->answer_b; ?></span><?php if ((int) $item->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><span><?php echo $item->answer_c; ?></span><?php if ((int) $item->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><span><?php echo $item->answer_d; ?></span><?php if ((int) $item->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                            <?php endif; ?>
+                        </div>
+                    <?php endif; ?>
                 </th>
-                <td><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_TYPE_' . strtoupper($item->question_type)); ?></td>
-                <td><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_ANSWER_' . chr(64 + (int) $item->correct_answer)); ?></td>
                 <td><?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'questions.', true, 'cb'); ?></td>
                 <td><?php echo (int) $item->id; ?></td>
             </tr>

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

@@ -0,0 +1,50 @@
+<?php defined('_JEXEC') or die; ?>
+<?php use Joomla\CMS\HTML\HTMLHelper; ?>
+<?php use Joomla\CMS\Router\Route; ?>
+<div class="container-fluid">
+    <dl class="row">
+        <div class="row"<?php echo (int) $this->item->extra_time > 0 ? ' style="background-color: #fff3cd;"' : ''; ?>>
+            <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_PARTICIPANT'); ?></dt>
+            <dd class="col-sm-9"><?php echo $this->escape($this->item->participant_name); ?></dd>
+        </div>
+        <dt class="col-sm-3"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></dt>
+        <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="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; ?>
+        <article class="mb-4 border rounded p-3">
+            <div class="mb-2"><?php echo $question->question; ?></div>
+            <?php if ($question->question_type === 'open') : ?>
+                <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_YOUR_ANSWER'); ?>:</strong> <?php echo htmlspecialchars($answer['selected'] ?: '—', ENT_QUOTES, 'UTF-8'); ?></div>
+                <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>
+            <?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'])) : ?>
+                <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>
+            <?php endif; ?>
+        </article>
+    <?php endforeach; ?>
+    <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'); ?>
+    </form>
+</div>

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

@@ -0,0 +1,54 @@
+<?php
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Router\Route;
+?>
+<form action="<?php echo Route::_('index.php?option=com_testquestions&view=results'); ?>" method="post" name="adminForm" id="adminForm">
+    <div class="row mb-3">
+        <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-6">
+            <input type="text" name="filter_test_name" value="<?php echo $this->escape($this->state->get('filter.test_name')); ?>" class="form-control" placeholder="<?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_TEST_NAME')); ?>">
+        </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>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_PARTICIPANT'); ?></th>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></th>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER'); ?></th>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_EXECUTION_TIME'); ?></th>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_DATE'); ?></th>
+        </tr></thead>
+        <tbody>
+        <?php foreach ($this->items as $item) : ?>
+            <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>
+                <?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>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+    <?php echo $this->pagination->getListFooter(); ?>
+    <input type="hidden" name="task" value="">
+    <?php echo HTMLHelper::_('form.token'); ?>
+</form>

administrator/components/com_testquestions/tmpl/set/edit.php

@@ -0,0 +1,121 @@
+<?php
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Router\Route;
+
+HTMLHelper::_('behavior.formvalidator');
+?>
+<form action="<?php echo Route::_('index.php?option=com_testquestions&view=set&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate">
+    <fieldset class="adminform">
+        <?php echo $this->form->renderField('title'); ?>
+        <?php echo $this->form->renderField('subject_id'); ?>
+        <?php echo $this->form->renderField('duration'); ?>
+        <output id="set-duration-value" class="form-text mb-3"></output>
+        <?php echo $this->form->renderField('test_content'); ?>
+        <?php echo $this->form->renderField('image'); ?>
+        <?php echo $this->form->renderField('description'); ?>
+        <?php echo $this->form->renderField('published'); ?>
+        <fieldset class="mb-3">
+            <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SELECTED_QUESTIONS'); ?></legend>
+            <div id="set-selected-question-list" class="border rounded p-3">
+                <?php foreach ($this->questions as $question) : ?>
+                    <?php if (!in_array((int) $question->id, array_map('intval', (array) $this->item->question_ids), true)) continue; ?>
+                    <div class="form-check set-question-row">
+                        <input class="form-check-input" type="checkbox" name="jform[question_ids][]" value="<?php echo (int) $question->id; ?>" id="set-question-<?php echo (int) $question->id; ?>" checked>
+                        <label class="form-check-label" for="set-question-<?php echo (int) $question->id; ?>">
+                            <span class="badge bg-secondary"><?php echo $this->escape($question->category_title ?: \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_UNCATEGORIZED')); ?></span>
+                            <?php echo $this->escape(trim(strip_tags($question->question))); ?>
+                        </label>
+                        <details class="ms-4 mt-1 mb-2">
+                            <summary><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SHOW_DETAILS'); ?></summary>
+                            <div class="mt-2 p-2 bg-light border rounded">
+                                <?php if ($question->question_type === 'open') : ?>
+                                    <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FIELD_OPEN_PATTERN'); ?>:</strong> <?php echo $this->escape($question->answer_open); ?></div>
+                                <?php else : ?>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">A:</strong><span><?php echo $question->answer_a; ?></span><?php if ((int) $question->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><span><?php echo $question->answer_b; ?></span><?php if ((int) $question->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><span><?php echo $question->answer_c; ?></span><?php if ((int) $question->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><span><?php echo $question->answer_d; ?></span><?php if ((int) $question->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                <?php endif; ?>
+                            </div>
+                        </details>
+                    </div>
+                <?php endforeach; ?>
+            </div>
+        </fieldset>
+        <fieldset class="mb-3">
+            <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_AVAILABLE_QUESTIONS'); ?></legend>
+            <div class="mb-3">
+                <label for="set-question-category" class="form-label"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_CATEGORY_FILTER'); ?></label>
+                <select id="set-question-category" class="form-select">
+                    <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_ALL_CATEGORIES'); ?></option>
+                    <?php foreach ($this->categories as $category) : ?>
+                        <option value="<?php echo (int) $category->id; ?>"><?php echo $this->escape($category->title); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+            <div id="set-available-question-list" class="border rounded p-3">
+                <?php foreach ($this->questions as $question) : ?>
+                    <?php if (in_array((int) $question->id, array_map('intval', (array) $this->item->question_ids), true)) continue; ?>
+                    <div class="form-check set-available-question-row" data-category="<?php echo (int) $question->category_id; ?>">
+                        <input class="form-check-input" type="checkbox" name="jform[question_ids][]" value="<?php echo (int) $question->id; ?>" id="set-question-<?php echo (int) $question->id; ?>">
+                        <label class="form-check-label" for="set-question-<?php echo (int) $question->id; ?>">
+                            <span class="badge bg-secondary"><?php echo $this->escape($question->category_title ?: \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_UNCATEGORIZED')); ?></span>
+                            <?php echo $this->escape(trim(strip_tags($question->question))); ?>
+                        </label>
+                        <details class="ms-4 mt-1 mb-2">
+                            <summary><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_SHOW_DETAILS'); ?></summary>
+                            <div class="mt-2 p-2 bg-light border rounded">
+                                <?php if ($question->question_type === 'open') : ?>
+                                    <div><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FIELD_OPEN_PATTERN'); ?>:</strong> <?php echo $this->escape($question->answer_open); ?></div>
+                                <?php else : ?>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">A:</strong><span><?php echo $question->answer_a; ?></span><?php if ((int) $question->correct_answer === 1) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">B:</strong><span><?php echo $question->answer_b; ?></span><?php if ((int) $question->correct_answer === 2) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">C:</strong><span><?php echo $question->answer_c; ?></span><?php if ((int) $question->correct_answer === 3) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                    <div class="d-flex gap-2 align-items-start"><strong class="flex-shrink-0">D:</strong><span><?php echo $question->answer_d; ?></span><?php if ((int) $question->correct_answer === 4) : ?><span class="text-success flex-shrink-0">✓</span><?php endif; ?></div>
+                                <?php endif; ?>
+                            </div>
+                        </details>
+                    </div>
+                <?php endforeach; ?>
+            </div>
+        </fieldset>
+    </fieldset>
+    <input type="hidden" name="task" value="">
+    <?php echo HTMLHelper::_('form.token'); ?>
+</form>
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    const filter = document.getElementById('set-question-category');
+    const rows = document.querySelectorAll('.set-available-question-row');
+
+    if (!filter) {
+        return;
+    }
+
+    filter.addEventListener('change', function () {
+        rows.forEach(function (row) {
+            row.classList.toggle('d-none', filter.value !== '' && row.dataset.category !== filter.value);
+        });
+    });
+});
+</script>
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    const duration = document.getElementById('jform_duration');
+    const output = document.getElementById('set-duration-value');
+
+    if (!duration || !output) {
+        return;
+    }
+
+    const updateDuration = function () {
+        output.textContent = duration.value + ' min';
+    };
+
+    duration.addEventListener('input', updateDuration);
+    updateDuration();
+});
+</script>

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

@@ -0,0 +1,65 @@
+<?php
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Router\Route;
+
+HTMLHelper::_('behavior.multiselect');
+?>
+<form action="<?php echo Route::_('index.php?option=com_testquestions&view=sets'); ?>" method="post" name="adminForm" id="adminForm">
+    <div class="row mb-3">
+        <div class="col-md-4">
+            <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_SET_SEARCH')); ?>">
+        </div>
+        <div class="col-md-2">
+            <select name="filter_published" class="form-select" onchange="this.form.submit();">
+                <option value=""><?php echo \Joomla\CMS\Language\Text::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+                <option value="1" <?php echo $this->state->get('filter.published') === '1' ? 'selected' : ''; ?>><?php echo \Joomla\CMS\Language\Text::_('JPUBLISHED'); ?></option>
+                <option value="0" <?php echo $this->state->get('filter.published') === '0' ? 'selected' : ''; ?>><?php echo \Joomla\CMS\Language\Text::_('JUNPUBLISHED'); ?></option>
+            </select>
+        </div>
+        <div class="col-md-3">
+            <select name="filter_subject_id" class="form-select" onchange="this.form.submit();">
+                <option value=""><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_FILTER_SUBJECT'); ?></option>
+                <?php foreach ($this->subjects as $subject) : ?>
+                    <option value="<?php echo (int) $subject->id; ?>" <?php echo (int) $this->state->get('filter.subject_id') === (int) $subject->id ? 'selected' : ''; ?>><?php echo $this->escape($subject->title); ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+        <div class="col-md-3">
+            <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+            <a href="<?php echo Route::_('index.php?option=com_testquestions&view=sets'); ?>" class="btn btn-secondary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_CLEAR'); ?></a>
+        </div>
+    </div>
+
+    <table class="table table-striped">
+        <thead>
+            <tr>
+                <th scope="col" class="w-1"><?php echo HTMLHelper::_('grid.checkall'); ?></th>
+                <th scope="col"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_TITLE'); ?></th>
+                <th scope="col"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SUBJECT'); ?></th>
+                <th scope="col" class="w-15"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_QUESTION_COUNT'); ?></th>
+                <th scope="col" class="w-15"><?php echo \Joomla\CMS\Language\Text::_('JSTATUS'); ?></th>
+                <th scope="col" class="w-10"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_ID'); ?></th>
+            </tr>
+        </thead>
+        <tbody>
+        <?php foreach ($this->items as $i => $item) : ?>
+            <tr>
+                <td><?php echo HTMLHelper::_('grid.id', $i, $item->id); ?></td>
+                <th scope="row"><a href="<?php echo Route::_('index.php?option=com_testquestions&task=set.edit&id=' . (int) $item->id); ?>"><?php echo $this->escape($item->title); ?></a></th>
+                <td><?php echo $this->escape($item->subject_title ?: '—'); ?></td>
+                <td><?php echo (int) $item->question_count; ?></td>
+                <td><?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'sets.', true, 'cb'); ?></td>
+                <td><?php echo (int) $item->id; ?></td>
+            </tr>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+
+    <?php echo $this->pagination->getListFooter(); ?>
+    <input type="hidden" name="boxchecked" value="0">
+    <input type="hidden" name="task" value="">
+    <?php echo HTMLHelper::_('form.token'); ?>
+</form>

administrator/components/com_testquestions/tmpl/subject/edit.php

@@ -0,0 +1,13 @@
+<?php
+
+defined('_JEXEC') or die;
+
+Joomla\CMS\HTML\HTMLHelper::_('behavior.formvalidator');
+?>
+<form action="index.php?option=com_testquestions&view=subject&layout=edit&id=<?php echo (int) $this->item->id; ?>" method="post" name="adminForm" id="subject-form" class="form-validate">
+    <?php echo $this->form->renderField('title'); ?>
+    <?php echo $this->form->renderField('published'); ?>
+    <?php echo $this->form->renderField('id'); ?>
+    <input type="hidden" name="task" value="">
+    <?php echo Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
+</form>

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

@@ -0,0 +1,24 @@
+<?php defined('_JEXEC') or die; ?>
+<form action="index.php?option=com_testquestions&view=subjects" method="post" name="adminForm" id="adminForm">
+    <table class="table table-striped">
+        <thead><tr>
+            <th><?php echo Joomla\CMS\HTML\HTMLHelper::_('grid.checkall'); ?></th>
+            <th><?php echo Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SUBJECT_TITLE'); ?></th>
+            <th><?php echo Joomla\CMS\Language\Text::_('JSTATUS'); ?></th>
+            <th><?php echo Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_COLUMN_ID'); ?></th>
+        </tr></thead>
+        <tbody>
+        <?php foreach ($this->items as $i => $item) : ?>
+            <tr>
+                <td><?php echo Joomla\CMS\HTML\HTMLHelper::_('grid.id', $i, $item->id); ?></td>
+                <th><a href="index.php?option=com_testquestions&task=subject.edit&id=<?php echo (int) $item->id; ?>"><?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?></a></th>
+                <td><?php echo $item->published ? Joomla\CMS\Language\Text::_('JPUBLISHED') : Joomla\CMS\Language\Text::_('JUNPUBLISHED'); ?></td>
+                <td><?php echo (int) $item->id; ?></td>
+            </tr>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+    <input type="hidden" name="boxchecked" value="0">
+    <input type="hidden" name="task" value="">
+    <?php echo Joomla\CMS\HTML\HTMLHelper::_('form.token'); ?>
+</form>