Compare commits

..
74 Commits
Author SHA1 Message Date
Wojtek bb1dc728d1 Diagnose empty AI API key configuration 2026-10-16 12:27:23 +02:00
Wojtek ed2c6b663b Normalize AI provider validation 2026-10-16 12:22:38 +02:00
Wojtek 03728ce49f Add AI key visibility toggle 2026-10-16 12:20:49 +02:00
Wojtek a7637aedcc Widen AI API key field 2026-10-16 12:17:12 +02:00
Wojtek 7f4f86080a Prefer stored AI configuration values 2026-10-16 12:14:39 +02:00
Wojtek 9e940c5710 Read saved AI component parameters 2026-10-16 12:07:29 +02:00
Wojtek 62befb825e Fix component AI configuration form 2026-10-16 11:56:56 +02:00
Wojtek 804c8f5467 Add AI evaluation for incorrect open answers 2026-10-16 11:53:23 +02:00
Wojtek 53dd9658e8 Order multi-variant questions without frontend randomization 2026-10-16 11:33:58 +02:00
Wojtek 5e12e8838d Add ordinary set ordering and random frontend questions 2026-10-16 11:27:37 +02:00
Wojtek 96e8a4a0f5 Inherit duration from parent set 2026-10-16 11:15:13 +02:00
Wojtek 3ee0b22d75 Remove apply button from set form 2026-10-16 10:35:23 +02:00
Wojtek 59335cbc52 Use explicit set save toolbar actions 2026-10-16 10:32:20 +02:00
Wojtek 5abf29cebb Fix variant save and close redirect 2026-10-16 10:29:52 +02:00
Wojtek defdfcb32f Return save and close from variant to parent 2026-10-16 10:28:31 +02:00
Wojtek 0f1bd3e9fe Return variant exit to parent set 2026-10-16 10:26:37 +02:00
Wojtek 8abee59a49 Remove questions from parent multi-variant sets 2026-10-16 10:21:52 +02:00
Wojtek 2e3bbe6fc6 Hide variants from main set list 2026-10-16 10:20:00 +02:00
Wojtek 8cc1862178 Add multi-variant test sets 2026-10-16 10:12:26 +02:00
Wojtek 6ff21ef245 Calculate grade from corrected percentage 2026-10-15 21:49:12 +02:00
Wojtek 8049b63f58 Stack result filters vertically 2026-10-15 21:46:19 +02:00
Wojtek 33783399f9 Use all sets in result filter 2026-10-15 21:43:24 +02:00
Wojtek 3fd488e19e Add result list date and test filters 2026-10-15 21:41:34 +02:00
Wojtek 301f322017 Show percentages for original and corrected points 2026-10-15 21:39:34 +02:00
Wojtek 987373b565 Set result toolbar labels 2026-10-15 21:37:06 +02:00
Wojtek 96bdb73450 Fix save and close toolbar button 2026-10-15 21:34:41 +02:00
Wojtek eac29077fc Separate save and save-and-close actions 2026-10-15 21:33:19 +02:00
Wojtek 8446e4a84a Move result save action to toolbar 2026-10-15 21:32:10 +02:00
Wojtek 1d0b6d7798 Move result save button to top 2026-10-15 21:29:31 +02:00
Wojtek 6c23252eef Remove correct answer detail label 2026-10-15 21:27:58 +02:00
Wojtek 1e14949574 Show maximum awarded points 2026-10-15 21:24:51 +02:00
Wojtek 5e259cd5c7 Hide correction fields for correct answers 2026-10-15 21:21:38 +02:00
Wojtek 5721370ea1 Include correction points in final score 2026-10-15 21:15:00 +02:00
Wojtek 1df6c6dfc3 Track corrected result points 2026-10-15 21:11:30 +02:00
Wojtek f3efb81af4 Add per-question result assessment fields 2026-10-15 21:07:44 +02:00
Wojtek 2af8f7c878 Highlight extended-time participant row 2026-10-15 21:04:19 +02:00
Wojtek dfc38e7eb0 Track test execution time 2026-10-15 20:52:15 +02:00
Wojtek 06d6cc2027 Highlight extended-time results 2026-10-15 20:49:45 +02:00
Wojtek e52d31a783 Add saved test result preview 2026-10-15 20:45:08 +02:00
Wojtek ceb6a6c6ef Persist test results 2026-10-15 20:43:52 +02:00
Wojtek 3eabeebf6b Warn with timer colors near timeout 2026-10-15 19:50:39 +02:00
Wojtek 83e70dd02f Refine fixed timer spacing and frame 2026-10-15 19:43:35 +02:00
Wojtek c9b39f795a Fix test timer to viewport corner 2026-10-15 19:41:31 +02:00
Wojtek 84aa7e637b Add automatic test countdown timer 2026-10-15 18:37:32 +02:00
Wojtek fe64990b1b Label submitted open answer 2026-10-15 18:26:11 +02:00
Wojtek 41ec027e42 Hide test controls after completion 2026-10-15 18:22:33 +02:00
Wojtek 463160c0c7 Add two-step set test start form 2026-10-15 18:12:53 +02:00
Wojtek 54c4c56469 Match set frontend to exam view 2026-10-15 18:05:11 +02:00
Wojtek b2ea519ff5 Add frontend test view for question sets 2026-10-15 18:01:09 +02:00
Wojtek c50e79164a Remove correct answer column entirely 2026-10-15 17:55:28 +02:00
Wojtek 68650492d3 Remove question type column 2026-10-15 17:51:04 +02:00
Wojtek 32cae2ffc3 Hide redundant correct answer column 2026-10-15 17:49:18 +02:00
Wojtek 03a9ea64ed Align answer preview and mark correct options 2026-10-15 17:46:40 +02:00
Wojtek 53d39ada2c Use minute slider for test duration 2026-10-15 17:36:32 +02:00
Wojtek 0c3ae353a5 Use seconds slider for test duration 2026-10-15 17:32:33 +02:00
Wojtek 197a03a2d0 Place correctness marker after answer 2026-10-15 17:31:00 +02:00
Wojtek 18574741be Keep correct answer marker inline 2026-10-15 17:28:55 +02:00
Wojtek baa00d37be Adjust test content editor and answer preview 2026-10-15 17:26:39 +02:00
Wojtek 4492097b5a Render test set fields in form 2026-10-15 17:24:26 +02:00
Wojtek bb96cb3116 Add test duration content and image to sets 2026-10-15 17:21:30 +02:00
Wojtek 70f9a0ac4b Separate selected and available set questions 2026-10-15 17:14:58 +02:00
Wojtek e762b207bb Add subject filter to question sets 2026-10-15 17:11:06 +02:00
Wojtek 105ca1f4e4 Enable Joomla subject form validation 2026-10-15 17:03:11 +02:00
Wojtek f70031ab70 Complete subject toolbar actions 2026-10-15 17:01:52 +02:00
Wojtek 19e8c7279a Use Joomla toolbar for subject form 2026-10-15 17:00:02 +02:00
Wojtek d6635c4499 Show subject field in set form 2026-10-15 16:57:29 +02:00
Wojtek 266deac4c9 Fix subject form actions 2026-10-15 16:55:20 +02:00
Wojtek 5ae5c6f277 Add configurable subjects to question sets 2026-10-15 16:53:06 +02:00
Wojtek c59bfb2813 Rename answer preview label 2026-10-15 16:49:51 +02:00
Wojtek 1e034b68e6 Avoid duplicating question in answer preview 2026-10-15 16:43:21 +02:00
Wojtek d09360e587 Fix set question saving and add previews 2026-10-15 16:39:00 +02:00
Wojtek 36e79f442e Add category filter to set question selection 2026-10-15 16:34:55 +02:00
Wojtek 1bed2d7dcc Add question set management 2026-10-15 16:30:43 +02:00
Wojtek 7d9c87bcb6 Tighten question and answer spacing 2026-10-15 13:08:26 +02:00
120 changed files with 2462 additions and 14 deletions
+9 -1
View File
@@ -11,6 +11,12 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
- 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,
@@ -18,10 +24,12 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
- 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.8.2).
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.42.7).
Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<config>
<fields name="params">
<fieldset name="basic" label="COM_TESTQUESTIONS_AI_SETTINGS">
<field name="ai_provider" type="list" label="COM_TESTQUESTIONS_AI_PROVIDER">
<option value="openai">OpenAI</option>
<option value="grok">Grok</option>
</field>
<field name="ai_api_key" type="aiapikey" addfieldprefix="Komponent\Component\Testquestions\Administrator\Field" label="COM_TESTQUESTIONS_AI_API_KEY" filter="raw" autocomplete="off" size="120" class="w-100" />
</fieldset>
</fields>
</config>
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset name="details">
<field name="id" type="hidden" />
<field name="parent_id" type="hidden" default="0" />
<field name="title" type="text" label="COM_TESTQUESTIONS_SET_TITLE" required="true" maxlength="255" />
<field name="set_type" type="list" label="COM_TESTQUESTIONS_SET_TYPE" default="ordinary" required="true">
<option value="ordinary">COM_TESTQUESTIONS_SET_TYPE_ORDINARY</option>
<option value="multi">COM_TESTQUESTIONS_SET_TYPE_MULTI</option>
<option value="variant">COM_TESTQUESTIONS_SET_TYPE_VARIANT</option>
</field>
<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>
@@ -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>
@@ -45,3 +45,74 @@ 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_TYPE="Rodzaj zestawu"
COM_TESTQUESTIONS_SET_TYPE_ORDINARY="Zwykły zestaw"
COM_TESTQUESTIONS_SET_TYPE_MULTI="Zestaw wielowariantowy"
COM_TESTQUESTIONS_SET_TYPE_VARIANT="Wariant zestawu"
COM_TESTQUESTIONS_SET_VARIANTS="Warianty zestawu"
COM_TESTQUESTIONS_SET_ADD_VARIANT="Dodaj wariant"
COM_TESTQUESTIONS_SET_PARENT="Zestaw nadrzędny"
COM_TESTQUESTIONS_SET_NO_VARIANTS="Brak wariantów"
COM_TESTQUESTIONS_SET_MULTI_QUESTIONS_INFO="Pytania są dodawane w poszczególnych wariantach zestawu."
COM_TESTQUESTIONS_SET_REORDER_INFO="Przeciągnij pytania, aby zmienić ich kolejność."
COM_TESTQUESTIONS_SET_SAVE="Zapisz"
COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE="Zapisz i zamknij"
COM_TESTQUESTIONS_SET_VARIANT_DURATION_INFO="Czas testu jest pobierany z zestawu nadrzędnego."
COM_TESTQUESTIONS_AI_SETTINGS="Ustawienia AI"
COM_TESTQUESTIONS_AI_PROVIDER="Dostawca AI"
COM_TESTQUESTIONS_AI_API_KEY="Klucz API"
COM_TESTQUESTIONS_AI_SETTINGS_MENU="Konfiguracja AI"
COM_TESTQUESTIONS_AI_EVALUATE="AI"
COM_TESTQUESTIONS_AI_RESULT="Ocena AI"
COM_TESTQUESTIONS_AI_NOT_CONFIGURED="Skonfiguruj dostawcę i klucz API w ustawieniach komponentu."
COM_TESTQUESTIONS_AI_ERROR="Nie udało się uzyskać odpowiedzi AI: %s"
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_GRADE="Ocena"
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_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ź"
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"
@@ -37,3 +37,63 @@ 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,
`parent_id` int unsigned NOT NULL DEFAULT 0,
`set_type` varchar(12) NOT NULL DEFAULT 'ordinary',
`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_parent_id` (`parent_id`),
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;
@@ -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`;
@@ -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`;
@@ -0,0 +1 @@
-- No database changes required for version 1.10.1.
@@ -0,0 +1 @@
-- No database changes required for version 1.10.2.
@@ -0,0 +1 @@
-- No database changes required for version 1.10.3.
@@ -0,0 +1 @@
-- No database changes required for version 1.10.4.
@@ -0,0 +1 @@
-- No database changes required for version 1.10.5.
@@ -0,0 +1 @@
-- No database changes required for version 1.10.6.
@@ -0,0 +1 @@
-- No database changes required for version 1.11.0.
@@ -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`;
@@ -0,0 +1 @@
-- No database changes required for version 1.12.1.
@@ -0,0 +1 @@
-- No database changes required for version 1.12.2.
@@ -0,0 +1 @@
-- No database changes required for version 1.12.3.
@@ -0,0 +1 @@
-- No database changes required for version 1.12.4.
@@ -0,0 +1,3 @@
UPDATE `#__testquestions_sets`
SET `duration` = `duration` * 60
WHERE `duration` > 0;
@@ -0,0 +1,3 @@
UPDATE `#__testquestions_sets`
SET `duration` = ROUND(`duration` / 60)
WHERE `duration` > 0;
@@ -0,0 +1 @@
-- No database changes required for version 1.13.2.
@@ -0,0 +1 @@
-- No database changes required for version 1.13.3.
@@ -0,0 +1 @@
-- No database changes required for version 1.13.4.
@@ -0,0 +1 @@
-- No database changes required for version 1.13.5.
@@ -0,0 +1 @@
-- No database changes required for version 1.14.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.14.1.
@@ -0,0 +1 @@
-- No database changes required for version 1.15.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.15.1.
@@ -0,0 +1 @@
-- No database changes required for version 1.15.2.
@@ -0,0 +1 @@
-- No database changes required for version 1.16.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.16.1.
@@ -0,0 +1 @@
-- No database changes required for version 1.16.2.
@@ -0,0 +1 @@
-- No database changes required for version 1.16.3.
@@ -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;
@@ -0,0 +1 @@
-- No database changes required for version 1.18.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.18.1.
@@ -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`;
@@ -0,0 +1 @@
-- No database changes required for version 1.19.1.
@@ -0,0 +1 @@
-- Per-question awarded points and comments are stored in the existing answers JSON column.
@@ -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;
@@ -0,0 +1 @@
-- Corrected points are calculated as automatic points plus manually awarded correction points.
@@ -0,0 +1 @@
-- No database changes required for version 1.23.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.24.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.25.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.26.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.27.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.28.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.28.1.
@@ -0,0 +1 @@
-- No database changes required for version 1.28.2.
@@ -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;
@@ -0,0 +1 @@
-- No database changes required for version 1.30.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.31.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.32.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.33.0.
@@ -0,0 +1,7 @@
ALTER TABLE `#__testquestions_sets`
ADD COLUMN `parent_id` int unsigned NOT NULL DEFAULT 0 AFTER `id`,
ADD COLUMN `set_type` varchar(12) NOT NULL DEFAULT 'ordinary' AFTER `parent_id`;
UPDATE `#__testquestions_sets`
SET `set_type` = 'ordinary'
WHERE `set_type` = '' OR `set_type` IS NULL;
@@ -0,0 +1 @@
-- No database changes required for version 1.35.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.36.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.37.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.37.1.
@@ -0,0 +1 @@
-- No database changes required for version 1.37.2.
@@ -0,0 +1 @@
-- No database changes required for version 1.37.3.
@@ -0,0 +1 @@
-- No database changes required for version 1.38.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.39.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.40.0.
@@ -0,0 +1 @@
-- No database changes required for version 1.41.0.
@@ -0,0 +1 @@
-- AI feedback is stored in the existing answers JSON column.
@@ -0,0 +1 @@
-- No database changes required for version 1.42.1.
@@ -0,0 +1 @@
-- No database changes required for version 1.42.2.
@@ -0,0 +1 @@
-- No database changes required for version 1.42.3.
@@ -0,0 +1 @@
-- No database changes required for version 1.42.4.
@@ -0,0 +1 @@
-- No database changes required for version 1.42.5.
@@ -0,0 +1 @@
-- No database changes required for version 1.42.6.
@@ -0,0 +1 @@
-- No database changes required for version 1.42.7.
@@ -0,0 +1 @@
-- No database changes required for version 1.8.3.
@@ -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;
@@ -0,0 +1 @@
-- No database changes required for version 1.9.1.
@@ -0,0 +1 @@
-- No database changes required for version 1.9.2.
@@ -0,0 +1 @@
-- No database changes required for version 1.9.3.
@@ -0,0 +1 @@
-- No database changes required for version 1.9.4.
@@ -0,0 +1,82 @@
<?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')
);
}
public function ai(): void
{
if (!Session::checkToken()) {
throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
}
$input = Factory::getApplication()->getInput();
$id = $input->post->getInt('id');
$questionId = $input->post->getInt('ai_question_id');
$message = Text::_('COM_TESTQUESTIONS_AI_RESULT');
$type = 'message';
try {
$this->getModel('Result')->evaluateWithAi($id, $questionId);
} catch (\Throwable $error) {
$errorMessage = $error->getMessage();
$message = str_starts_with($errorMessage, 'AI_KEY_EMPTY|')
? 'Diagnostyka konfiguracji AI (1.42.7): ' . substr($errorMessage, strlen('AI_KEY_EMPTY|'))
: ($errorMessage === 'AI_NOT_CONFIGURED'
? Text::_('COM_TESTQUESTIONS_AI_NOT_CONFIGURED')
: Text::sprintf('COM_TESTQUESTIONS_AI_ERROR', $errorMessage));
$type = 'error';
}
$this->setRedirect(
Route::_('index.php?option=com_testquestions&view=result&id=' . $id, false),
$message,
$type
);
}
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'));
}
}
}
@@ -0,0 +1,101 @@
<?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 addvariant(): void
{
$parentId = $this->input->getInt('parent_id');
$this->setRedirect('index.php?option=com_testquestions&view=set&layout=edit&parent_id=' . $parentId);
}
public function save2close($key = null, $urlVar = null)
{
$formData = (array) $this->input->post->get('jform', [], 'array');
$parentId = (int) ($formData['parent_id'] ?? 0);
$itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
$result = parent::save2close($key, $urlVar);
if ($result) {
if ($itemId > 0) {
$item = $this->getModel()->getItem($itemId);
$parentId = (int) ($item->parent_id ?? $parentId);
}
if ($parentId > 0) {
$this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $parentId);
}
}
return $result;
}
public function save($key = null, $urlVar = null)
{
$formData = (array) $this->input->post->get('jform', [], 'array');
$result = parent::save($key, $urlVar);
$itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
if ($result && $itemId > 0) {
$this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $itemId);
}
return $result;
}
public function saveandclose($key = null, $urlVar = null)
{
$formData = (array) $this->input->post->get('jform', [], 'array');
$parentId = (int) ($formData['parent_id'] ?? 0);
$result = parent::save($key, $urlVar);
$itemId = (int) ($formData['id'] ?? $this->input->getInt('id'));
if ($result && $itemId > 0 && $parentId < 1) {
$item = $this->getModel()->getItem($itemId);
$parentId = (int) ($item->parent_id ?? 0);
}
if ($result) {
$this->setRedirect(
$parentId > 0
? 'index.php?option=com_testquestions&task=set.edit&id=' . $parentId
: 'index.php?option=com_testquestions&view=sets'
);
}
return $result;
}
public function cancel($key = null)
{
$parentId = $this->input->getInt('parent_id');
$formData = (array) $this->input->post->get('jform', [], 'array');
$parentId = (int) ($formData['parent_id'] ?? $parentId);
if ($parentId < 1) {
$itemId = $this->input->getInt('id');
if ($itemId > 0) {
$item = $this->getModel()->getItem($itemId);
$parentId = (int) ($item->parent_id ?? 0);
}
}
if ($parentId > 0) {
$this->setRedirect('index.php?option=com_testquestions&task=set.edit&id=' . $parentId);
return true;
}
$this->setRedirect('index.php?option=com_testquestions&view=sets');
return true;
}
}
@@ -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);
}
}
@@ -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;
}
}
@@ -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);
}
}
@@ -0,0 +1,37 @@
<?php
namespace Komponent\Component\Testquestions\Administrator\Field;
defined('_JEXEC') or die;
use Joomla\CMS\Form\FormField;
class AiapikeyField extends FormField
{
protected $type = 'Aiapikey';
protected function getInput(): string
{
$id = htmlspecialchars($this->id, ENT_QUOTES, 'UTF-8');
$name = htmlspecialchars($this->name, ENT_QUOTES, 'UTF-8');
$value = htmlspecialchars((string) $this->value, ENT_QUOTES, 'UTF-8');
$length = mb_strlen((string) $this->value);
return '<div class="input-group">'
. '<input type="password" id="' . $id . '" name="' . $name . '" value="' . $value . '" size="120" autocomplete="off" class="form-control">'
. '<button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="' . $id . '">Pokaż</button>'
. '</div>'
. '<small class="form-text text-muted">Zapisany klucz: ' . (int) $length . ' znaków.</small>'
. '<script>
document.addEventListener("click", function (event) {
var button = event.target.closest("[data-ai-key-toggle]");
if (!button) return;
var input = document.getElementById(button.getAttribute("data-ai-key-toggle"));
if (!input) return;
var visible = input.type === "text";
input.type = visible ? "password" : "text";
button.textContent = visible ? "Pokaż" : "Ukryj";
});
</script>';
}
}
@@ -0,0 +1,156 @@
<?php
namespace Komponent\Component\Testquestions\Administrator\Model;
defined('_JEXEC') or die;
use Joomla\CMS\Factory;
use Joomla\CMS\MVC\Model\BaseDatabaseModel;
use Joomla\CMS\Component\ComponentHelper;
use Komponent\Component\Testquestions\Administrator\Service\AiService;
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');
}
public function evaluateWithAi(int $id, int $questionId): string
{
$item = $this->getItem($id);
if (!$item) {
throw new \RuntimeException('Nie znaleziono zapisanego testu.');
}
$answer = $item->answers[$questionId] ?? null;
$question = $item->questions[$questionId] ?? null;
if (!$item || !$answer || !$question || $question->question_type !== 'open' || !empty($answer['correct'])) {
throw new \RuntimeException('Nieprawidłowe pytanie do oceny AI.');
}
$params = ComponentHelper::getParams('com_testquestions');
$provider = trim((string) $params->get('ai_provider', 'openai'));
$apiKey = trim((string) $params->get('ai_api_key', ''));
$componentKeyLength = mb_strlen($apiKey);
// Odczytaj zapisane parametry bezpośrednio z bazy. Dzięki temu nie użyjemy
// nieaktualnej wartości z pamięci ComponentHelper, a maska pola hasła
// (np. ********) nie zostanie potraktowana jako prawdziwy klucz.
$db = Factory::getContainer()->get('DatabaseDriver');
$storedParams = (string) $db->setQuery(
$db->getQuery(true)
->select($db->quoteName('params'))
->from($db->quoteName('#__extensions'))
->where($db->quoteName('type') . ' = ' . $db->quote('component'))
->where($db->quoteName('element') . ' = ' . $db->quote('com_testquestions'))
)->loadResult();
$storedParams = json_decode($storedParams, true);
if (is_array($storedParams)) {
$storedProvider = trim((string) ($storedParams['ai_provider'] ?? ''));
$storedApiKey = trim((string) ($storedParams['ai_api_key'] ?? ''));
if ($storedProvider !== '') {
$provider = $storedProvider;
}
if ($storedApiKey !== '' && !preg_match('/^\*+$/', $storedApiKey)) {
$apiKey = $storedApiKey;
}
}
if (trim($apiKey) === '') {
$databaseKey = is_array($storedParams) ? trim((string) ($storedParams['ai_api_key'] ?? '')) : '';
$databaseKeyLength = preg_match('/^\*+$/', $databaseKey) ? 0 : mb_strlen($databaseKey);
throw new \RuntimeException(
'AI_KEY_EMPTY|provider=' . ($provider !== '' ? $provider : '(pusty)')
. '|component_chars=' . $componentKeyLength
. '|database_chars=' . $databaseKeyLength
. '|database_params=' . (is_array($storedParams) ? 'json' : 'unreadable')
);
}
$feedback = (new AiService())->evaluate(
$provider,
$apiKey,
strip_tags((string) $question->question),
(string) ($answer['selected'] ?? ''),
(string) $question->answer_open
);
$item->answers[$questionId]['ai_feedback'] = $feedback;
$db = Factory::getContainer()->get('DatabaseDriver');
$row = (object) [
'id' => $id,
'answers' => json_encode($item->answers, JSON_UNESCAPED_UNICODE),
];
if (!$db->updateObject('#__testquestions_results', $row, 'id')) {
throw new \RuntimeException('Nie udało się zapisać oceny AI.');
}
return $feedback;
}
}
@@ -0,0 +1,66 @@
<?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.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()
{
$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 . ')');
}
$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();
}
}
@@ -0,0 +1,210 @@
<?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');
if ((int) $item->parent_id > 0) {
$item->parent_title = (string) $db->setQuery(
$db->getQuery(true)
->select($db->quoteName('title'))
->from($db->quoteName('#__testquestions_sets'))
->where($db->quoteName('id') . ' = ' . (int) $item->parent_id)
)->loadResult();
}
$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()
{
$data = Factory::getApplication()->getUserState('com_testquestions.edit.set.data', []) ?: $this->getItem();
$parentId = Factory::getApplication()->getInput()->getInt('parent_id');
$hasId = is_array($data) ? !empty($data['id']) : !empty($data->id);
if ($parentId > 0 && !$hasId) {
$parent = $this->getItem($parentId);
$variantCount = count($this->getVariants($parentId));
if ($parent) {
$data = [
'parent_id' => $parentId,
'set_type' => 'variant',
'title' => $parent->title . ' — wariant ' . ($variantCount + 1),
'subject_id' => $parent->subject_id,
'duration' => $parent->duration,
'test_content' => $parent->test_content,
'image' => $parent->image,
'description' => $parent->description,
'published' => $parent->published,
'question_ids' => [],
];
}
}
return $data;
}
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 getVariants($parentId = null)
{
$parentId = (int) ($parentId ?: Factory::getApplication()->getInput()->getInt('id'));
if ($parentId < 1) {
return [];
}
$db = Factory::getContainer()->get('DatabaseDriver');
return $db->setQuery(
$db->getQuery(true)
->select(['id', 'title', 'published'])
->from($db->quoteName('#__testquestions_sets'))
->where($db->quoteName('parent_id') . ' = ' . $parentId)
->order($db->quoteName('ordering') . ' ASC, ' . $db->quoteName('id') . ' 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']);
$parentId = (int) ($formData['parent_id'] ?? $data['parent_id'] ?? 0);
$parentId = max(0, $parentId);
$data['parent_id'] = $parentId;
if ($parentId > 0) {
$data['set_type'] = 'variant';
$parent = $this->getItem($parentId);
if ($parent) {
$data['duration'] = (int) $parent->duration;
}
} elseif (!in_array(($data['set_type'] ?? 'ordinary'), ['ordinary', 'multi'], true)) {
$data['set_type'] = 'ordinary';
}
if ($parentId === 0 && ($data['set_type'] ?? 'ordinary') === 'multi') {
$questionIds = [];
}
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) {
$childIds = $db->setQuery(
$db->getQuery(true)
->select($db->quoteName('id'))
->from($db->quoteName('#__testquestions_sets'))
->where($db->quoteName('parent_id') . ' IN (' . implode(',', $ids) . ')')
)->loadColumn();
$ids = array_values(array_unique(array_merge($ids, array_map('intval', $childIds))));
}
if ($ids) {
$db->setQuery(
$db->getQuery(true)
->delete($db->quoteName('#__testquestions_set_questions'))
->where($db->quoteName('set_id') . ' IN (' . implode(',', $ids) . ')')
)->execute();
$db->setQuery(
$db->getQuery(true)
->delete($db->quoteName('#__testquestions_sets'))
->where($db->quoteName('id') . ' IN (' . implode(',', $ids) . ')')
)->execute();
}
return true;
}
}
@@ -0,0 +1,61 @@
<?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', 'p.title AS parent_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_sets', 'p') . ' ON p.id = s.parent_id')
->leftJoin($db->quoteName('#__testquestions_set_questions', 'sq') . ' ON sq.set_id = s.id')
->where('s.parent_id = 0')
->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();
}
}
@@ -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();
}
}
@@ -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');
}
}
@@ -0,0 +1,79 @@
<?php
namespace Komponent\Component\Testquestions\Administrator\Service;
defined('_JEXEC') or die;
use Joomla\CMS\Http\HttpFactory;
class AiService
{
public function evaluate(string $provider, string $apiKey, string $question, string $answer, string $pattern): string
{
$provider = strtolower(trim($provider));
$provider = preg_replace('/[^a-z]/', '', $provider);
$config = $provider === 'grok'
? ['url' => 'https://api.x.ai/v1/responses', 'model' => 'grok-4.7']
: ['url' => 'https://api.openai.com/v1/responses', 'model' => 'gpt-4.1-mini'];
if (trim($apiKey) === '') {
throw new \RuntimeException('AI_NOT_CONFIGURED');
}
if (!in_array($provider, ['openai', 'grok'], true)) {
throw new \RuntimeException('Nieprawidłowy dostawca AI: ' . $provider);
}
$input = "Oceń odpowiedź ucznia na pytanie otwarte.\n\n"
. "Pytanie:\n" . $question . "\n\n"
. "Wzorzec odpowiedzi:\n" . $pattern . "\n\n"
. "Odpowiedź ucznia:\n" . ($answer !== '' ? $answer : 'Brak odpowiedzi') . "\n\n"
. "Napisz po polsku krótką ocenę: czy odpowiedź może zostać uznana za poprawną, jakie elementy są poprawne lub błędne oraz czy warto przyznać punkty. Nie zmieniaj wzorca odpowiedzi.";
$payload = json_encode([
'model' => $config['model'],
'input' => $input,
'temperature' => 0.1,
], JSON_UNESCAPED_UNICODE);
$response = HttpFactory::getHttp()->post(
$config['url'],
$payload,
[
'Authorization' => 'Bearer ' . trim($apiKey),
'Content-Type' => 'application/json',
],
60
);
$body = json_decode((string) $response->body, true);
if ((int) $response->code < 200 || (int) $response->code >= 300) {
throw new \RuntimeException((string) ($body['error']['message'] ?? ('HTTP ' . (int) $response->code)));
}
$text = $this->extractText($body);
if ($text === '') {
throw new \RuntimeException('Brak treści odpowiedzi AI.');
}
return $text;
}
private function extractText(array $body): string
{
if (!empty($body['output_text']) && is_string($body['output_text'])) {
return trim($body['output_text']);
}
$parts = [];
foreach ((array) ($body['output'] ?? []) as $output) {
foreach ((array) ($output['content'] ?? []) as $content) {
if (!empty($content['text']) && is_string($content['text'])) {
$parts[] = $content['text'];
}
}
}
return trim(implode("\n", $parts));
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -51,5 +51,23 @@ 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'
);
ToolbarHelper::link(
'index.php?option=com_config&view=component&component=com_testquestions',
'COM_TESTQUESTIONS_AI_SETTINGS_MENU',
'cog'
);
}
}
@@ -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);
}
}
@@ -0,0 +1,30 @@
<?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;
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');
return parent::display($tpl);
}
}
@@ -0,0 +1,54 @@
<?php
namespace Komponent\Component\Testquestions\Administrator\View\Set;
defined('_JEXEC') or die;
use Joomla\CMS\Factory;
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;
protected $variants;
protected $isVariant;
protected $parentTitle = '';
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');
$this->variants = $this->item && (int) $this->item->id > 0 ? $this->get('Variants') : [];
$parentId = Factory::getApplication()->getInput()->getInt('parent_id');
$this->isVariant = (int) ($this->item->parent_id ?? 0) > 0 || $parentId > 0;
$this->parentTitle = (string) ($this->item->parent_title ?? '');
if ($this->isVariant && $this->parentTitle === '' && $parentId > 0) {
$parent = $this->getModel()->getItem($parentId);
$this->parentTitle = (string) ($parent->title ?? '');
}
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::custom('set.save', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE', false);
ToolbarHelper::custom('set.saveandclose', 'save', 'save', 'COM_TESTQUESTIONS_SET_SAVE_AND_CLOSE', false);
ToolbarHelper::cancel('set.cancel', 'JTOOLBAR_CANCEL');
}
}

Some files were not shown because too many files have changed in this diff Show More