Treat placeholder comments as empty in PDF

README.md

@@ -16,6 +16,7 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - 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,
@@ -29,6 +30,6 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 
 ## Instalacja
 
-W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.18.1).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.41).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

administrator/components/com_testquestions/config.xml

@@ -0,0 +1,14 @@
+<?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>
+                <option value="groq">Groq</option>
+                <option value="gemini">Gemini</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>

administrator/components/com_testquestions/forms/set.xml

@@ -2,7 +2,13 @@
 <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>

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

@@ -46,14 +46,73 @@ COM_TESTQUESTIONS_ERROR_OPEN_PATTERN="Dla pytania otwartego wpisz wzorzec popraw
 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_SETS_UNPUBLISH_ALL="Wyłącz wszystkie zestawy"
+COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL_CONFIRM="Czy na pewno wyłączyć wszystkie zestawy testów, w tym wszystkie warianty?"
+COM_TESTQUESTIONS_SETS_UNPUBLISHED_ALL="Wyłączono %s zestawów."
 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_SET_VARIANT_STATUS_INHERITED="Status publikacji wariantu jest taki sam jak status zestawu nadrzędnego i zmienia się razem z nim."
+COM_TESTQUESTIONS_AI_SETTINGS="Ustawienia AI"
+COM_TESTQUESTIONS_AI_PROVIDER="Dostawca AI"
+COM_TESTQUESTIONS_AI_API_KEY="Klucz API"
+COM_TESTQUESTIONS_AI_OPENAI_KEY="Klucz API OpenAI"
+COM_TESTQUESTIONS_AI_GROK_KEY="Klucz API Grok"
+COM_TESTQUESTIONS_AI_GROQ_KEY="Klucz API Groq"
+COM_TESTQUESTIONS_AI_GEMINI_KEY="Klucz API Gemini"
+COM_TESTQUESTIONS_AI_OPENAI_MODEL="Model OpenAI"
+COM_TESTQUESTIONS_AI_GROK_MODEL="Model Grok"
+COM_TESTQUESTIONS_AI_GROQ_MODEL="Model Groq API"
+COM_TESTQUESTIONS_AI_GEMINI_MODEL="Model Gemini"
+COM_TESTQUESTIONS_AI_MODEL_INVALID="Wybierz prawidłowy model dla każdego dostawcy AI."
+COM_TESTQUESTIONS_AI_TOKEN_USAGE="Wykorzystanie tokenów API"
+COM_TESTQUESTIONS_AI_TOKEN_USAGE_INFO="Suma użycia zapisanego przy ocenach AI we wszystkich wynikach testów. Powtórne oceny są zliczane, jeśli zostały wykonane po tej aktualizacji."
+COM_TESTQUESTIONS_AI_USAGE_CALLS="Liczba ocen"
+COM_TESTQUESTIONS_AI_USAGE_INPUT="Tokeny wejściowe"
+COM_TESTQUESTIONS_AI_USAGE_OUTPUT="Tokeny wyjściowe"
+COM_TESTQUESTIONS_AI_USAGE_TOTAL="Razem tokenów"
+COM_TESTQUESTIONS_AI_USAGE_COST="Koszt zapisany"
+COM_TESTQUESTIONS_PREVIEW_SELECTED="Podgląd zaznaczonych"
+COM_TESTQUESTIONS_PREVIEW_TITLE="Podgląd pytań testowych"
+COM_TESTQUESTIONS_PREVIEW_READONLY="Tryb podglądu — odpowiedzi są nieaktywne, test nie ma limitu czasu ani przycisku zakończenia."
+COM_TESTQUESTIONS_PREVIEW_EMPTY="Nie znaleziono pytań do wyświetlenia."
+COM_TESTQUESTIONS_PREVIEW_SELECT_QUESTIONS="Zaznacz pytania, które chcesz podejrzeć."
+COM_TESTQUESTIONS_PREVIEW_BACK="Wróć do listy pytań"
+COM_TESTQUESTIONS_PREVIEW_SET="Podgląd zestawu"
+COM_TESTQUESTIONS_AI_SETTINGS_MENU="Konfiguracja AI"
+COM_TESTQUESTIONS_AI_SETTINGS_SAVED="Ustawienia AI zapisano."
+COM_TESTQUESTIONS_AI_SAVE_FAILED="Nie udało się zapisać ustawień AI."
+COM_TESTQUESTIONS_AI_PROVIDER_INVALID="Wybierz prawidłowego dostawcę AI."
+COM_TESTQUESTIONS_AI_EVALUATE_ALL="AI — oceń wszystkie niezaliczone pytania otwarte (%s)"
+COM_TESTQUESTIONS_AI_BULK_DONE="AI oceniło %s pytań."
+COM_TESTQUESTIONS_AI_BULK_PARTIAL="AI oceniło %s pytań; nie udało się ocenić %s. Błąd: %s"
+COM_TESTQUESTIONS_AI_NO_OPEN_QUESTIONS="Brak niezaliczonych pytań otwartych do oceny 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_CHOOSE_CATEGORY="Wybierz kategorię"
+COM_TESTQUESTIONS_SET_ID_FILTER="Filtruj pytania według ID"
+COM_TESTQUESTIONS_SET_ID_FILTER_HINT="Wpisz ID, np. 12, 34, 56"
+COM_TESTQUESTIONS_SET_SELECT_ALL_VISIBLE="Zaznacz wszystkie widoczne pytania"
 COM_TESTQUESTIONS_SET_ALL_CATEGORIES="Wszystkie kategorie"
 COM_TESTQUESTIONS_UNCATEGORIZED="Bez kategorii"
 COM_TESTQUESTIONS_SET_SHOW_DETAILS="Pokaż odpowiedzi"
@@ -66,14 +125,33 @@ 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_AI_TOKENS="Tokeny AI"
+COM_TESTQUESTIONS_RESULTS_AI_TOKENS_TOTAL="Łączne wykorzystanie tokenów w wynikach"
 COM_TESTQUESTIONS_RESULT_SCORE="Wynik"
+COM_TESTQUESTIONS_RESULT_POINTS_BEFORE_AFTER="Punkty przed / po korekcie"
+COM_TESTQUESTIONS_RESULT_GRADE="Ocena"
+COM_TESTQUESTIONS_RESULT_NOT_ASSESSED="Nie sprawdzono"
+COM_TESTQUESTIONS_RESULT_GENERATE_PDF="Generuj PDF / drukuj"
 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_RESULTS_DELETED="Usunięto %s zapisanych testów."
+COM_TESTQUESTIONS_RESULTS_DELETE_NONE="Zaznacz testy, które chcesz usunąć."
 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_ANSWER_PARTIALLY_CORRECT="Odpowiedź częściowo poprawna"
 COM_TESTQUESTIONS_CORRECT_PATTERN="Wzorzec poprawnej odpowiedzi"
 COM_TESTQUESTIONS_SUBJECT="Przedmiot"
 COM_TESTQUESTIONS_SUBJECT_TITLE="Nazwa przedmiotu"

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

@@ -40,6 +40,8 @@ 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,
@@ -54,6 +56,7 @@ CREATE TABLE IF NOT EXISTS `#__testquestions_sets` (
   `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;
 
@@ -78,10 +81,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 '',
+  `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,

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.31.0.sql

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

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

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

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

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

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

@@ -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;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+-- AI feedback is stored in the existing answers JSON column.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.17: zmieniono przyciski paska narzędzi podglądu zestawu.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.18: dodano filtrowanie dostępnych pytań po ID podczas edycji zestawu.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.19: usprawniono filtrowanie i zaznaczanie pytań w edycji zestawu.

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

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

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.20: czas testu bez ustawionego limitu zestawu jest sumowany z czasów pytań.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.21: naprawiono wyświetlanie obrazów w szczegółach rozwiązanego testu.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.22: kolejność odpowiedzi zamkniętych jest losowana i zapisywana dla podejścia.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.23: zachowano w wyniku kolejność pytań z wylosowanego testu.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.24: ukryto ocenę AI i korektę punktów dla pustych odpowiedzi.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.25: kolor oceny AI odzwierciedla poziom uznanych punktów.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.26: dodano zbiorcze usuwanie zapisanych testów.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.27: dodano dostawcę Groq API.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.28: dodano dostawcę Gemini API.

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.29: ograniczono czas generowania oceny przez Gemini.

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

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

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

@@ -0,0 +1 @@
+-- Wydanie 1.43.30: odczyt tokenów Gemini z pola usageMetadata.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.31.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.32.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.33.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.34.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.35.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.36.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.37.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.38.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.39.

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

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

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.40.

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

@@ -0,0 +1 @@
+-- Brak zmian w schemacie bazy danych w wersji 1.43.41.

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

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

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

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

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

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

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

@@ -0,0 +1,5 @@
+UPDATE `#__extensions`
+SET `params` = JSON_REMOVE(`params`, '$.ai_grok_team_id', '$.ai_grok_management_key')
+WHERE `type` = 'component'
+  AND `element` = 'com_testquestions'
+  AND JSON_VALID(`params`);

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

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

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

@@ -0,0 +1,103 @@
+<?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;
+use Komponent\Component\Testquestions\Administrator\Service\AiService;
+
+class AiController extends BaseController
+{
+    public function save(): void
+    {
+        $this->saveSettings();
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=ai', false),
+            Text::_('COM_TESTQUESTIONS_AI_SETTINGS_SAVED')
+        );
+    }
+
+    private function saveSettings(): array
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
+        }
+
+        $user = Factory::getApplication()->getIdentity();
+        if (!$user->authorise('core.admin', 'com_testquestions') && !$user->authorise('core.options', 'com_testquestions')) {
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+        }
+
+        $input = Factory::getApplication()->getInput();
+        $provider = strtolower($input->post->getCmd('ai_provider', ''));
+        if (!in_array($provider, ['openai', 'grok', 'groq', 'gemini'], true)) {
+            throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_PROVIDER_INVALID'));
+        }
+
+        $models = AiService::availableModels();
+        $selectedModels = [];
+        foreach (['openai', 'grok', 'groq', 'gemini'] as $modelProvider) {
+            $model = trim($input->post->getString('ai_' . $modelProvider . '_model', ''));
+            if (!isset($models[$modelProvider][$model])) {
+                throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_MODEL_INVALID'));
+            }
+            $selectedModels[$modelProvider] = $model;
+        }
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $row = $db->setQuery(
+            $db->getQuery(true)
+                ->select([$db->quoteName('extension_id'), $db->quoteName('params')])
+                ->from($db->quoteName('#__extensions'))
+                ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+                ->where($db->quoteName('element') . ' = ' . $db->quote('com_testquestions'))
+        )->loadObject();
+
+        if (!$row) {
+            throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_SAVE_FAILED'));
+        }
+
+        $settings = json_decode((string) $row->params, true);
+        $settings = is_array($settings) ? $settings : [];
+        $legacyKey = trim((string) ($settings['ai_api_key'] ?? ''));
+        $settings['ai_provider'] = $provider;
+        foreach ($selectedModels as $modelProvider => $model) {
+            $settings['ai_' . $modelProvider . '_model'] = $model;
+        }
+
+        foreach (['openai', 'grok', 'groq', 'gemini'] as $keyProvider) {
+            $fieldName = 'ai_' . $keyProvider . '_api_key';
+            $apiKey = trim((string) $input->post->get($fieldName, '', 'RAW'));
+            if ($apiKey !== '') {
+                $settings[$fieldName] = $apiKey;
+            }
+            if ($keyProvider === $provider && empty($settings[$fieldName]) && $legacyKey !== '') {
+                $settings[$fieldName] = $legacyKey;
+            }
+        }
+
+        unset($settings['ai_api_key']);
+        unset($settings['ai_grok_team_id'], $settings['ai_grok_management_key']);
+
+        $extension = (object) [
+            'extension_id' => (int) $row->extension_id,
+            'params' => json_encode($settings, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
+        ];
+        if (!$db->updateObject('#__extensions', $extension, 'extension_id')) {
+            throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_SAVE_FAILED'));
+        }
+
+        return $settings;
+    }
+
+    public function cancel(): void
+    {
+        $this->setRedirect(Route::_('index.php?option=com_testquestions&view=questions', false));
+    }
+}

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

@@ -4,7 +4,11 @@ namespace Komponent\Component\Testquestions\Administrator\Controller;
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
 
 class QuestionsController extends AdminController
 {
@@ -14,4 +18,28 @@ class QuestionsController extends AdminController
     {
         return parent::getModel($name, $prefix, $config);
     }
+
+    public function preview(): void
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
+        }
+
+        $user = Factory::getApplication()->getIdentity();
+        if (!$user->authorise('core.edit', 'com_testquestions') && !$user->authorise('core.manage', 'com_testquestions')) {
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+        }
+
+        $ids = array_values(array_unique(array_filter(array_map('intval', (array) $this->input->post->get('cid', [], 'array')))));
+        if (!$ids) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_testquestions&view=questions', false),
+                Text::_('COM_TESTQUESTIONS_PREVIEW_SELECT_QUESTIONS'),
+                'warning'
+            );
+            return;
+        }
+
+        $this->setRedirect(Route::_('index.php?option=com_testquestions&view=preview&ids=' . implode(',', $ids), false));
+    }
 }

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

@@ -0,0 +1,123 @@
+<?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.8): ' . 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
+        );
+    }
+
+    public function aiAll(): void
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
+        }
+
+        $input = Factory::getApplication()->getInput();
+        $id = $input->post->getInt('id');
+        $message = '';
+        $type = 'message';
+
+        try {
+            $summary = $this->getModel('Result')->evaluateAllWithAi($id);
+            if ($summary['failed'] > 0) {
+                $message = Text::sprintf(
+                    'COM_TESTQUESTIONS_AI_BULK_PARTIAL',
+                    $summary['evaluated'],
+                    $summary['failed'],
+                    $summary['first_error']
+                );
+                $type = 'warning';
+            } else {
+                $message = Text::sprintf('COM_TESTQUESTIONS_AI_BULK_DONE', $summary['evaluated']);
+            }
+        } catch (\Throwable $error) {
+            $errorMessage = $error->getMessage();
+            $message = $errorMessage === 'AI_NO_OPEN_QUESTIONS'
+                ? Text::_('COM_TESTQUESTIONS_AI_NO_OPEN_QUESTIONS')
+                : ($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'));
+        }
+    }
+}

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

@@ -0,0 +1,54 @@
+<?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\AdminController;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+
+class ResultsController extends AdminController
+{
+    public function delete()
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
+        }
+
+        $user = Factory::getApplication()->getIdentity();
+        if (!$user->authorise('core.delete', 'com_testquestions')) {
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+        }
+
+        $ids = array_values(array_unique(array_filter(array_map(
+            'intval',
+            (array) $this->input->post->get('cid', [], 'array')
+        ), static function ($id) {
+            return $id > 0;
+        })));
+
+        if (!$ids) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_testquestions&view=results', false),
+                Text::_('COM_TESTQUESTIONS_RESULTS_DELETE_NONE'),
+                'warning'
+            );
+            return;
+        }
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $db->setQuery(
+            $db->getQuery(true)
+                ->delete($db->quoteName('#__testquestions_results'))
+                ->where($db->quoteName('id') . ' IN (' . implode(',', $ids) . ')')
+        )->execute();
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=results', false),
+            Text::sprintf('COM_TESTQUESTIONS_RESULTS_DELETED', $db->getAffectedRows())
+        );
+    }
+}

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

@@ -11,8 +11,89 @@ 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;

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

@@ -5,11 +5,40 @@ namespace Komponent\Component\Testquestions\Administrator\Controller;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
 
 class SetsController extends AdminController
 {
     protected $text_prefix = 'COM_TESTQUESTIONS';
 
+    public function unpublishall(): void
+    {
+        if (!Session::checkToken()) {
+            throw new \RuntimeException(Text::_('JINVALID_TOKEN'), 403);
+        }
+
+        $user = Factory::getApplication()->getIdentity();
+        if (!$user->authorise('core.edit.state', 'com_testquestions') && !$user->authorise('core.edit', 'com_testquestions')) {
+            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+        }
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $db->setQuery(
+            $db->getQuery(true)
+                ->update($db->quoteName('#__testquestions_sets'))
+                ->set($db->quoteName('published') . ' = 0')
+                ->where($db->quoteName('published') . ' = 1')
+        )->execute();
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_testquestions&view=sets', false),
+            Text::sprintf('COM_TESTQUESTIONS_SETS_UNPUBLISHED_ALL', $db->getAffectedRows())
+        );
+    }
+
     public function getModel($name = 'Set', $prefix = 'Administrator', $config = ['ignore_request' => true])
     {
         return parent::getModel($name, $prefix, $config);

administrator/components/com_testquestions/src/Field/AiapikeyField.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Field;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Form\Field\PasswordField;
+
+class AiapikeyField extends PasswordField
+{
+    protected $type = 'Aiapikey';
+
+    protected function getInput(): string
+    {
+        $id = htmlspecialchars($this->id, ENT_QUOTES, 'UTF-8');
+        $length = mb_strlen((string) $this->value);
+
+        return '<div class="input-group">'
+            . parent::getInput()
+            . '<button type="button" class="btn btn-outline-secondary" data-ai-key-toggle="' . $id . '">Pokaż</button>'
+            . '</div>'
+            . '<small class="form-text text-muted">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>';
+    }
+}

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

@@ -0,0 +1,69 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+
+class PreviewModel extends BaseDatabaseModel
+{
+    public function getSet()
+    {
+        $setId = Factory::getApplication()->getInput()->getInt('set_id');
+        if ($setId < 1) {
+            return null;
+        }
+
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['id', 'title', 'test_content', 'image'])
+                ->from($db->quoteName('#__testquestions_sets'))
+                ->where($db->quoteName('id') . ' = ' . $setId)
+        )->loadObject();
+    }
+
+    public function getItems(): array
+    {
+        $input = Factory::getApplication()->getInput();
+        $setId = $input->getInt('set_id');
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        if ($setId > 0) {
+            return $db->setQuery(
+                $db->getQuery(true)
+                    ->select(['q.id', 'q.question_type', 'q.question', 'q.answer_a', 'q.answer_b', 'q.answer_c', 'q.answer_d', 'q.answer_open', 'q.correct_answer', 'q.image'])
+                    ->from($db->quoteName('#__testquestions_set_questions', 'sq'))
+                    ->innerJoin($db->quoteName('#__testquestions_questions', 'q') . ' ON q.id = sq.question_id')
+                    ->where('sq.set_id = ' . $setId)
+                    ->where('q.published = 1')
+                    ->order('sq.ordering ASC, q.id ASC')
+            )->loadObjectList();
+        }
+
+        $ids = array_values(array_unique(array_filter(array_map('intval', explode(',', $input->getString('ids', ''))))));
+
+        if (!$ids) {
+            return [];
+        }
+
+        $rows = $db->setQuery(
+            $db->getQuery(true)
+                ->select(['id', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'image'])
+                ->from($db->quoteName('#__testquestions_questions'))
+                ->where($db->quoteName('id') . ' IN (' . implode(',', $ids) . ')')
+        )->loadObjectList('id');
+
+        $items = [];
+        foreach ($ids as $id) {
+            if (isset($rows[$id])) {
+                $items[] = $rows[$id];
+            }
+        }
+
+        return $items;
+    }
+}

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

@@ -6,6 +6,8 @@ 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
 {
@@ -15,7 +17,7 @@ class ResultModel extends BaseDatabaseModel
         $db = Factory::getContainer()->get('DatabaseDriver');
         $item = $db->setQuery(
             $db->getQuery(true)
-                ->select(['r.*', 's.title AS set_title', 'sub.title AS subject_title'])
+                ->select(['r.*', 's.title AS set_title', 's.image AS set_image', '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')
@@ -33,7 +35,7 @@ class ResultModel extends BaseDatabaseModel
         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'])
+                    ->select(['id', 'question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'points', 'image'])
                     ->from($db->quoteName('#__testquestions_questions'))
                     ->where('id IN (' . implode(',', $ids) . ')')
             )->loadObjectList('id');
@@ -41,4 +43,198 @@ class ResultModel extends BaseDatabaseModel
 
         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'));
+        $provider = strtolower(preg_replace('/[^a-z]/', '', $provider));
+        $keyName = 'ai_' . $provider . '_api_key';
+        $apiKey = trim((string) $params->get($keyName, $params->get('ai_api_key', '')));
+        $componentKeyLength = mb_strlen($apiKey);
+        $defaultModels = ['openai' => 'gpt-4.1-mini', 'grok' => 'grok-4.7', 'groq' => 'openai/gpt-oss-120b', 'gemini' => 'gemini-3.8-flash'];
+        $model = trim((string) $params->get('ai_' . $provider . '_model', $defaultModels[$provider] ?? ''));
+
+        // 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;
+            }
+        }
+
+        $provider = strtolower(preg_replace('/[^a-z]/', '', $provider));
+        $keyName = 'ai_' . $provider . '_api_key';
+        $apiKey = trim((string) $params->get($keyName, $params->get('ai_api_key', '')));
+        $componentKeyLength = mb_strlen($apiKey);
+        $model = trim((string) (is_array($storedParams)
+            ? ($storedParams['ai_' . $provider . '_model'] ?? $params->get('ai_' . $provider . '_model', $defaultModels[$provider] ?? ''))
+            : $params->get('ai_' . $provider . '_model', $defaultModels[$provider] ?? '')));
+        if ($model === '') {
+            $model = $defaultModels[$provider] ?? '';
+        }
+        $storedApiKey = is_array($storedParams)
+            ? trim((string) ($storedParams[$keyName] ?? $storedParams['ai_api_key'] ?? ''))
+            : '';
+        if ($storedApiKey !== '' && !preg_match('/^\*+$/', $storedApiKey)) {
+            $apiKey = $storedApiKey;
+        }
+
+        if (trim($apiKey) === '') {
+            $databaseKey = $storedApiKey;
+            $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')
+            );
+        }
+
+        $aiResult = (new AiService())->evaluate(
+            $provider,
+            $apiKey,
+            $model,
+            strip_tags((string) $question->question),
+            (string) ($answer['selected'] ?? ''),
+            (string) $question->answer_open,
+            (int) $question->points
+        );
+        $item->answers[$questionId]['ai_feedback'] = $aiResult['feedback'];
+        $item->answers[$questionId]['awarded_points'] = $aiResult['awarded_points'];
+        if ($aiResult['usage'] !== null) {
+            $history = $item->answers[$questionId]['ai_usage_history'] ?? null;
+            if (!is_array($history)) {
+                $history = !empty($item->answers[$questionId]['ai_usage']) && is_array($item->answers[$questionId]['ai_usage'])
+                    ? [$item->answers[$questionId]['ai_usage']]
+                    : [];
+            }
+            $history[] = $aiResult['usage'];
+            $item->answers[$questionId]['ai_usage_history'] = $history;
+            $item->answers[$questionId]['ai_usage'] = $aiResult['usage'];
+        }
+
+        $correctionPoints = 0;
+        foreach ($item->answers as $savedAnswer) {
+            $correctionPoints += (int) ($savedAnswer['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,
+        ];
+
+        if (!$db->updateObject('#__testquestions_results', $row, 'id')) {
+            throw new \RuntimeException('Nie udało się zapisać oceny AI.');
+        }
+
+        return $aiResult['feedback'];
+    }
+
+    public function evaluateAllWithAi(int $id): array
+    {
+        $item = $this->getItem($id);
+
+        if (!$item) {
+            throw new \RuntimeException('Nie znaleziono zapisanego testu.');
+        }
+
+        $questionIds = [];
+        foreach ($item->answers as $questionId => $answer) {
+            $question = $item->questions[(int) $questionId] ?? null;
+            if ($question && $question->question_type === 'open' && empty($answer['correct']) && trim((string) ($answer['selected'] ?? '')) !== '') {
+                $questionIds[] = (int) $questionId;
+            }
+        }
+
+        if (!$questionIds) {
+            throw new \RuntimeException('AI_NO_OPEN_QUESTIONS');
+        }
+
+        $evaluated = 0;
+        $failed = 0;
+        $firstError = '';
+
+        foreach ($questionIds as $questionId) {
+            try {
+                $this->evaluateWithAi($id, $questionId);
+                $evaluated++;
+            } catch (\Throwable $error) {
+                $failed++;
+                $firstError = $firstError ?: $error->getMessage();
+
+                if (in_array($error->getMessage(), ['AI_NOT_CONFIGURED'], true)
+                    || str_starts_with($error->getMessage(), 'AI_KEY_EMPTY|')) {
+                    break;
+                }
+            }
+        }
+
+        return [
+            'evaluated' => $evaluated,
+            'failed' => $failed,
+            'first_error' => $firstError,
+            'total' => count($questionIds),
+        ];
+    }
 }

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

@@ -9,10 +9,120 @@ use Joomla\CMS\MVC\Model\ListModel;
 
 class ResultsModel extends ListModel
 {
+    public function getItems()
+    {
+        $items = parent::getItems();
+
+        foreach ($items as $item) {
+            $item->has_assessment = false;
+            $item->ai_input_tokens = 0;
+            $item->ai_output_tokens = 0;
+            $item->ai_total_tokens = 0;
+            $item->ai_cost_usd = 0.0;
+            $item->ai_tokens_by_provider = ['openai' => 0, 'grok' => 0, 'groq' => 0, 'gemini' => 0];
+
+            $answers = json_decode((string) ($item->answers ?? ''), true);
+            if (!is_array($answers)) {
+                continue;
+            }
+
+            foreach ($answers as $answer) {
+                if (!is_array($answer)) {
+                    continue;
+                }
+
+                // Manual assessment and AI both save awarded_points in the answer JSON.
+                if (array_key_exists('awarded_points', $answer)) {
+                    $item->has_assessment = true;
+                }
+
+                $usages = $answer['ai_usage_history'] ?? (isset($answer['ai_usage']) ? [$answer['ai_usage']] : []);
+                if (!is_array($usages)) {
+                    continue;
+                }
+
+                foreach ($usages as $usage) {
+                    if (!is_array($usage)) {
+                        continue;
+                    }
+                    $item->ai_input_tokens += (int) ($usage['input_tokens'] ?? 0);
+                    $item->ai_output_tokens += (int) ($usage['output_tokens'] ?? 0);
+                    $item->ai_total_tokens += (int) ($usage['total_tokens'] ?? 0);
+                    $provider = (string) ($usage['provider'] ?? '');
+                    if (isset($item->ai_tokens_by_provider[$provider])) {
+                        $item->ai_tokens_by_provider[$provider] += (int) ($usage['total_tokens'] ?? 0);
+                    }
+                    if (is_numeric($usage['cost_usd'] ?? null)) {
+                        $item->ai_cost_usd += (float) $usage['cost_usd'];
+                    }
+                }
+            }
+        }
+
+        return $items;
+    }
+
+    public function getAiUsageTotals(): array
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $query = clone $this->getListQuery();
+        $query->clear('select')->clear('order')->select($db->quoteName('r.answers'));
+        $answersRows = $db->setQuery($query)->loadColumn();
+        $emptyProviderTotals = ['input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0];
+        $totals = [
+            'input_tokens' => 0,
+            'output_tokens' => 0,
+            'total_tokens' => 0,
+            'cost_usd' => 0.0,
+            'providers' => ['openai' => $emptyProviderTotals, 'grok' => $emptyProviderTotals, 'groq' => $emptyProviderTotals, 'gemini' => $emptyProviderTotals],
+        ];
+
+        foreach ($answersRows as $answersJson) {
+            $answers = json_decode((string) $answersJson, true);
+            if (!is_array($answers)) {
+                continue;
+            }
+            foreach ($answers as $answer) {
+                if (!is_array($answer)) {
+                    continue;
+                }
+                $usages = $answer['ai_usage_history'] ?? (isset($answer['ai_usage']) ? [$answer['ai_usage']] : []);
+                if (!is_array($usages)) {
+                    continue;
+                }
+                foreach ($usages as $usage) {
+                    if (!is_array($usage)) {
+                        continue;
+                    }
+                    $totals['input_tokens'] += (int) ($usage['input_tokens'] ?? 0);
+                    $totals['output_tokens'] += (int) ($usage['output_tokens'] ?? 0);
+                    $totals['total_tokens'] += (int) ($usage['total_tokens'] ?? 0);
+                    if (is_numeric($usage['cost_usd'] ?? null)) {
+                        $totals['cost_usd'] += (float) $usage['cost_usd'];
+                    }
+                    $provider = (string) ($usage['provider'] ?? '');
+                    if (isset($totals['providers'][$provider])) {
+                        $totals['providers'][$provider]['input_tokens'] += (int) ($usage['input_tokens'] ?? 0);
+                        $totals['providers'][$provider]['output_tokens'] += (int) ($usage['output_tokens'] ?? 0);
+                        $totals['providers'][$provider]['total_tokens'] += (int) ($usage['total_tokens'] ?? 0);
+                        if (is_numeric($usage['cost_usd'] ?? null)) {
+                            $totals['providers'][$provider]['cost_usd'] += (float) $usage['cost_usd'];
+                        }
+                    }
+                }
+            }
+        }
+
+        return $totals;
+    }
+
     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()
@@ -30,6 +140,34 @@ class ResultsModel extends ListModel
             $query->where('(r.participant_name LIKE ' . $needle . ' OR s.title LIKE ' . $needle . ')');
         }
 
+        $setId = (int) $this->getState('filter.set_id');
+        if ($setId > 0) {
+            $query->where('r.set_id = ' . $setId);
+        }
+
+        $dateFrom = (string) $this->getState('filter.date_from');
+        if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $dateFrom)) {
+            $query->where('r.created >= ' . $db->quote($dateFrom . ' 00:00:00'));
+        }
+
+        $dateTo = (string) $this->getState('filter.date_to');
+        if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $dateTo)) {
+            $query->where('r.created <= ' . $db->quote($dateTo . ' 23:59:59'));
+        }
+
         return $query->order('r.created DESC, r.id DESC');
     }
+
+    public function getSets(): array
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+
+        return $db->setQuery(
+            $db->getQuery(true)
+                ->select(['s.id', 's.title', 's.published', 'sub.title AS subject_title'])
+                ->from($db->quoteName('#__testquestions_sets', 's'))
+                ->leftJoin($db->quoteName('#__testquestions_subjects', 'sub') . ' ON sub.id = s.subject_id')
+                ->order('sub.title ASC, s.title ASC, s.id ASC')
+        )->loadObjectList();
+    }
 }

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

@@ -9,6 +9,26 @@ use Joomla\CMS\MVC\Model\AdminModel;
 
 class SetModel extends AdminModel
 {
+    public function publish(&$pks, $value = 1)
+    {
+        $ids = array_values(array_unique(array_filter(array_map('intval', (array) $pks))));
+        if (!parent::publish($pks, $value)) {
+            return false;
+        }
+
+        if ($ids) {
+            $db = Factory::getContainer()->get('DatabaseDriver');
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->update($db->quoteName('#__testquestions_sets'))
+                    ->set($db->quoteName('published') . ' = ' . (int) $value)
+                    ->where($db->quoteName('parent_id') . ' IN (' . implode(',', $ids) . ')')
+            )->execute();
+        }
+
+        return true;
+    }
+
     public function getTable($name = 'Set', $prefix = 'Administrator', $config = [])
     {
         return $this->getMVCFactory()->createTable($name, $prefix, $config);
@@ -25,6 +45,14 @@ class SetModel extends AdminModel
 
         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'))
@@ -41,7 +69,32 @@ class SetModel extends AdminModel
 
     protected function loadFormData()
     {
-        return Factory::getApplication()->getUserState('com_testquestions.edit.set.data', []) ?: $this->getItem();
+        $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()
@@ -69,18 +122,65 @@ class SetModel extends AdminModel
         )->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;
+                $data['published'] = (int) $parent->published;
+            }
+        } 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');
+        if ($parentId === 0) {
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->update($db->quoteName('#__testquestions_sets'))
+                    ->set($db->quoteName('published') . ' = ' . (int) ($data['published'] ?? 1))
+                    ->where($db->quoteName('parent_id') . ' = ' . $setId)
+            )->execute();
+        }
+
         $db->setQuery(
             $db->getQuery(true)
                 ->delete($db->quoteName('#__testquestions_set_questions'))
@@ -111,12 +211,28 @@ class SetModel extends AdminModel
         $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;

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

@@ -21,10 +21,12 @@ class SetsModel extends ListModel
     {
         $db = Factory::getContainer()->get('DatabaseDriver');
         $query = $db->getQuery(true)
-            ->select(['s.*', 'sub.title AS subject_title', 'COUNT(sq.question_id) AS question_count'])
+            ->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'));

administrator/components/com_testquestions/src/Service/AiService.php

@@ -0,0 +1,235 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\Service;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Http\HttpFactory;
+
+class AiService
+{
+    public static function availableModels(): array
+    {
+        return [
+            'openai' => [
+                'gpt-4.1-mini' => 'GPT-4.1 mini (starszy)',
+                'gpt-5.6-luna' => 'GPT-5.6 Luna',
+                'gpt-5.6-terra' => 'GPT-5.6 Terra',
+                'gpt-5.6-sol' => 'GPT-5.6 Sol',
+                'gpt-6-luna' => 'GPT-6 Luna',
+            ],
+            'grok' => [
+                'grok-4.7' => 'Grok 4.7',
+                'grok-4.20' => 'Grok 4.20 Reasoning',
+                'grok-4.20-non-reasoning' => 'Grok 4.20 Non-Reasoning',
+            ],
+            'groq' => [
+                'openai/gpt-oss-120b' => 'GPT OSS 120B',
+                'openai/gpt-oss-20b' => 'GPT OSS 20B',
+                'llama-3.3-70b-versatile' => 'Llama 3.3 70B Versatile',
+            ],
+            'gemini' => [
+                'gemini-3.8-flash' => 'Gemini 3.8 Flash',
+                'gemini-3.1-pro-preview' => 'Gemini 3.1 Pro (Preview)',
+            ],
+        ];
+    }
+
+    public function evaluate(string $provider, string $apiKey, string $model, string $question, string $answer, string $pattern, int $maxPoints): array
+    {
+        $provider = strtolower(trim($provider));
+        $provider = preg_replace('/[^a-z]/', '', $provider);
+        $config = match ($provider) {
+            'grok' => ['url' => 'https://api.x.ai/v1/responses'],
+            'groq' => ['url' => 'https://api.groq.com/openai/v1/chat/completions'],
+            'gemini' => ['url' => 'https://generativelanguage.googleapis.com/v1beta/models/' . rawurlencode($model) . ':generateContent'],
+            default => ['url' => 'https://api.openai.com/v1/responses'],
+        };
+
+        if (trim($apiKey) === '') {
+            throw new \RuntimeException('AI_NOT_CONFIGURED');
+        }
+
+        if (!in_array($provider, ['openai', 'grok', 'groq', 'gemini'], true)) {
+            throw new \RuntimeException('Nieprawidłowy dostawca AI: ' . $provider);
+        }
+
+        if (!isset(self::availableModels()[$provider][$model])) {
+            throw new \RuntimeException('Wybrany model AI nie jest obsługiwany.');
+        }
+
+        $input = "Oceń odpowiedź ucznia na pytanie otwarte i ustal liczbę uznanych punktów.\n"
+            . "Maksymalna liczba punktów za to pytanie: " . max(0, $maxPoints) . ".\n"
+            . "Przyznaj liczbę całkowitą od 0 do maksymalnej liczby punktów. Przyznaj punkty proporcjonalnie za poprawne elementy odpowiedzi; pełne punkty za komplet, część punktów za częściową odpowiedź. Nie przekraczaj limitu.\n\n"
+            . "Pytanie:\n" . $question . "\n\n"
+            . "Wzorzec odpowiedzi:\n" . $pattern . "\n\n"
+            . "Odpowiedź ucznia:\n" . ($answer !== '' ? $answer : 'Brak odpowiedzi') . "\n\n"
+            . "Zwróć wyłącznie poprawny obiekt JSON w formacie {\"awarded_points\": liczba_całkowita, \"feedback\": \"krótka ocena po polsku\"}. W ocenie opisz poprawne i brakujące elementy. Nie zmieniaj wzorca odpowiedzi.";
+
+        $requestData = match ($provider) {
+            'groq' => [
+                'model' => $model,
+                'messages' => [['role' => 'user', 'content' => $input]],
+                'temperature' => 0.1,
+            ],
+            'gemini' => [
+                'contents' => [['parts' => [['text' => $input]]]],
+                'generationConfig' => [
+                    'maxOutputTokens' => 256,
+                    'responseMimeType' => 'application/json',
+                    'thinkingConfig' => ['thinkingLevel' => 'low'],
+                ],
+            ],
+            default => [
+                'model' => $model,
+                'input' => $input,
+            ],
+        };
+        // GPT-5.x reasoning models do not accept a custom temperature.
+        if ($provider === 'grok' || ($provider === 'openai' && $model === 'gpt-4.1-mini')) {
+            $requestData['temperature'] = 0.1;
+        }
+        $payload = json_encode($requestData, JSON_UNESCAPED_UNICODE);
+
+        $headers = [
+            'Content-Type' => 'application/json',
+        ];
+        if ($provider === 'gemini') {
+            $headers['x-goog-api-key'] = trim($apiKey);
+        } else {
+            $headers['Authorization'] = 'Bearer ' . trim($apiKey);
+        }
+
+        $response = HttpFactory::getHttp()->post(
+            $config['url'],
+            $payload,
+            $headers,
+            $provider === 'gemini' ? 25 : 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.');
+        }
+
+        $jsonText = preg_replace('/^```(?:json)?\s*|\s*```$/i', '', trim($text));
+        $result = json_decode($jsonText, true);
+
+        if (!is_array($result) || !isset($result['awarded_points']) || !is_numeric($result['awarded_points'])) {
+            $start = strpos($jsonText, '{');
+            $end = strrpos($jsonText, '}');
+            if ($start !== false && $end !== false && $end > $start) {
+                $result = json_decode(substr($jsonText, $start, $end - $start + 1), true);
+            }
+        }
+
+        if (!is_array($result) || !isset($result['awarded_points']) || !is_numeric($result['awarded_points'])) {
+            throw new \RuntimeException('AI zwróciło nieprawidłowy format oceny i punktów.');
+        }
+
+        $actualModel = (string) ($body['model'] ?? $model);
+        $usage = $this->getUsage($body, $provider, $model);
+        if ($usage !== null) {
+            $usage['model'] = $actualModel;
+        }
+
+        return [
+            'awarded_points' => min(max(0, $maxPoints), max(0, (int) $result['awarded_points'])),
+            'feedback' => trim((string) ($result['feedback'] ?? '')),
+            'usage' => $usage,
+        ];
+    }
+
+    private function getUsage(array $body, string $provider, string $model): ?array
+    {
+        // Gemini uses camelCase UsageMetadata at the response root; the
+        // OpenAI-compatible providers return their counters in `usage`.
+        $usage = $body['usageMetadata'] ?? $body['usage'] ?? null;
+        if (!is_array($usage)) {
+            return null;
+        }
+
+        $inputTokens = max(0, (int) ($usage['input_tokens'] ?? $usage['prompt_tokens'] ?? $usage['promptTokenCount'] ?? 0));
+        $outputTokens = max(0, (int) ($usage['output_tokens'] ?? $usage['completion_tokens'] ?? (
+            (int) ($usage['candidatesTokenCount'] ?? 0) + (int) ($usage['thoughtsTokenCount'] ?? 0)
+        )));
+        if ((!isset($usage['input_tokens']) && !isset($usage['prompt_tokens']) && !isset($usage['promptTokenCount']))
+            || (!isset($usage['output_tokens']) && !isset($usage['completion_tokens']) && !isset($usage['candidatesTokenCount']))) {
+            return null;
+        }
+        $cachedTokens = min($inputTokens, max(0, (int) ($usage['input_tokens_details']['cached_tokens'] ?? $usage['cachedContentTokenCount'] ?? 0)));
+        $cost = null;
+        $costSource = '';
+
+        if ($provider === 'grok' && isset($usage['cost_in_usd_ticks']) && is_numeric($usage['cost_in_usd_ticks'])) {
+            $cost = (float) $usage['cost_in_usd_ticks'] / 10000000000;
+            $costSource = 'provider';
+        } elseif ($provider === 'openai' && isset($this->openAiRates()[$model])) {
+            [$inputRate, $cachedRate, $outputRate, $cacheWriteRate] = $this->openAiRates()[$model];
+            $uncachedTokens = $inputTokens - $cachedTokens;
+            $cacheWriteTokens = min($uncachedTokens, max(0, (int) ($usage['input_tokens_details']['cache_write_tokens'] ?? 0)));
+            $uncachedTokens -= $cacheWriteTokens;
+            $cost = ($uncachedTokens * $inputRate + $cachedTokens * $cachedRate + $cacheWriteTokens * $cacheWriteRate + $outputTokens * $outputRate) / 1000000;
+            $costSource = 'token_rates';
+        }
+
+        return [
+            'provider' => $provider,
+            'model' => $model,
+            'input_tokens' => $inputTokens,
+            'output_tokens' => $outputTokens,
+            'total_tokens' => (int) ($usage['total_tokens'] ?? $usage['totalTokenCount'] ?? ($inputTokens + $outputTokens)),
+            'cached_input_tokens' => $cachedTokens,
+            'cost_usd' => $cost,
+            'cost_source' => $costSource,
+        ];
+    }
+
+    private function openAiRates(): array
+    {
+        return [
+            'gpt-4.1-mini' => [0.40, 0.10, 1.60, 0.40],
+            'gpt-5.6-luna' => [0.20, 0.02, 1.20, 0.25],
+            'gpt-5.6-terra' => [2.00, 0.20, 12.00, 2.50],
+            'gpt-5.6-sol' => [4.00, 0.40, 20.00, 5.00],
+            'gpt-6-luna' => [0.10, 0.01, 0.50, 0.125],
+        ];
+    }
+
+    private function extractText(array $body): string
+    {
+        if (isset($body['candidates'][0]['content']['parts']) && is_array($body['candidates'][0]['content']['parts'])) {
+            $parts = [];
+            foreach ($body['candidates'][0]['content']['parts'] as $part) {
+                if (isset($part['text']) && is_string($part['text'])) {
+                    $parts[] = $part['text'];
+                }
+            }
+            return trim(implode("\n", $parts));
+        }
+
+        if (isset($body['choices'][0]['message']['content']) && is_string($body['choices'][0]['message']['content'])) {
+            return trim($body['choices'][0]['message']['content']);
+        }
+
+        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));
+    }
+}

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

@@ -0,0 +1,84 @@
+<?php
+
+namespace Komponent\Component\Testquestions\Administrator\View\Ai;
+
+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 array $settings = [];
+    protected array $usageTotals = [];
+
+    public function display($tpl = null)
+    {
+        $db = Factory::getContainer()->get('DatabaseDriver');
+        $raw = (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();
+        $this->settings = json_decode($raw, true) ?: [];
+        $this->usageTotals = [
+            'openai' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
+            'grok' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
+            'groq' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
+            'gemini' => ['calls' => 0, 'input_tokens' => 0, 'output_tokens' => 0, 'total_tokens' => 0, 'cost_usd' => 0.0, 'cost_calls' => 0],
+        ];
+
+        $usageRows = $db->setQuery(
+            $db->getQuery(true)
+                ->select($db->quoteName('answers'))
+                ->from($db->quoteName('#__testquestions_results'))
+                ->where($db->quoteName('answers') . ' LIKE ' . $db->quote('%ai_usage%'))
+        )->loadColumn();
+
+        foreach ($usageRows as $answersJson) {
+            $answers = json_decode((string) $answersJson, true);
+            if (!is_array($answers)) {
+                continue;
+            }
+
+            foreach ($answers as $answer) {
+                if (!is_array($answer)) {
+                    continue;
+                }
+
+                $usages = $answer['ai_usage_history'] ?? (isset($answer['ai_usage']) ? [$answer['ai_usage']] : []);
+                if (!is_array($usages)) {
+                    continue;
+                }
+
+                foreach ($usages as $usage) {
+                    if (!is_array($usage)) {
+                        continue;
+                    }
+                    $provider = (string) ($usage['provider'] ?? '');
+                    if (!isset($this->usageTotals[$provider])) {
+                        continue;
+                    }
+
+                    $this->usageTotals[$provider]['calls']++;
+                    $this->usageTotals[$provider]['input_tokens'] += (int) ($usage['input_tokens'] ?? 0);
+                    $this->usageTotals[$provider]['output_tokens'] += (int) ($usage['output_tokens'] ?? 0);
+                    $this->usageTotals[$provider]['total_tokens'] += (int) ($usage['total_tokens'] ?? 0);
+                    if (is_numeric($usage['cost_usd'] ?? null)) {
+                        $this->usageTotals[$provider]['cost_usd'] += (float) $usage['cost_usd'];
+                        $this->usageTotals[$provider]['cost_calls']++;
+                    }
+                }
+            }
+        }
+
+        ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_AI_SETTINGS'));
+        ToolbarHelper::link('index.php?option=com_testquestions&view=questions', 'COM_TESTQUESTIONS_QUESTIONS', 'arrow-left');
+
+        return parent::display($tpl);
+    }
+}