Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7ed00f95e6 | ||
|
|
57065d4ca1 | ||
|
|
7d9efd64f4 | ||
|
|
6daca5be59 | ||
|
|
dc6b5ad3e8 | ||
|
|
aa12305e65 | ||
|
|
af98d0d1d4 | ||
|
|
acfdf21488 | ||
|
|
3efb937469 | ||
|
|
bb1dc728d1 | ||
|
|
ed2c6b663b | ||
|
|
03728ce49f | ||
|
|
a7637aedcc | ||
|
|
7f4f86080a | ||
|
|
9e940c5710 | ||
|
|
62befb825e | ||
|
|
804c8f5467 | ||
|
|
53dd9658e8 | ||
|
|
5e12e8838d | ||
|
|
96e8a4a0f5 | ||
|
|
3ee0b22d75 | ||
|
|
59335cbc52 | ||
|
|
5abf29cebb | ||
|
|
defdfcb32f | ||
|
|
0f1bd3e9fe | ||
|
|
8abee59a49 | ||
|
|
2e3bbe6fc6 | ||
|
|
8cc1862178 | ||
|
|
6ff21ef245 | ||
|
|
8049b63f58 | ||
|
|
33783399f9 | ||
|
|
3fd488e19e | ||
|
|
301f322017 | ||
|
|
987373b565 | ||
|
|
96bdb73450 | ||
|
|
eac29077fc | ||
|
|
8446e4a84a | ||
|
|
1d0b6d7798 | ||
|
|
6c23252eef | ||
|
|
1e14949574 | ||
|
|
5e259cd5c7 | ||
|
|
5721370ea1 | ||
|
|
1df6c6dfc3 | ||
|
|
f3efb81af4 | ||
|
|
2af8f7c878 | ||
|
|
dfc38e7eb0 | ||
|
|
06d6cc2027 | ||
|
|
e52d31a783 | ||
|
|
ceb6a6c6ef | ||
|
|
3eabeebf6b | ||
|
|
83e70dd02f | ||
|
|
c9b39f795a | ||
|
|
84aa7e637b | ||
|
|
fe64990b1b | ||
|
|
41ec027e42 | ||
|
|
463160c0c7 | ||
|
|
54c4c56469 | ||
|
|
b2ea519ff5 | ||
|
|
c50e79164a | ||
|
|
68650492d3 | ||
|
|
32cae2ffc3 | ||
|
|
03a9ea64ed | ||
|
|
53d39ada2c | ||
|
|
0c3ae353a5 | ||
|
|
197a03a2d0 | ||
|
|
18574741be | ||
|
|
baa00d37be | ||
|
|
4492097b5a | ||
|
|
bb96cb3116 | ||
|
|
70f9a0ac4b | ||
|
|
e762b207bb | ||
|
|
105ca1f4e4 | ||
|
|
f70031ab70 | ||
|
|
19e8c7279a | ||
|
|
d6635c4499 | ||
|
|
266deac4c9 | ||
|
|
5ae5c6f277 | ||
|
|
c59bfb2813 | ||
|
|
1e034b68e6 | ||
|
|
d09360e587 | ||
|
|
36e79f442e | ||
|
|
1bed2d7dcc | ||
|
|
7d9c87bcb6 | ||
|
|
b4af647616 | ||
|
|
252348a07f | ||
|
|
b3451728d9 | ||
|
|
27f37e8500 |
@@ -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.7.0).
|
||||
W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.6).
|
||||
|
||||
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,86 @@ 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_OPENAI_KEY="Klucz API OpenAI"
|
||||
COM_TESTQUESTIONS_AI_GROK_KEY="Klucz API Grok"
|
||||
COM_TESTQUESTIONS_AI_OPENAI_MODEL="Model OpenAI"
|
||||
COM_TESTQUESTIONS_AI_GROK_MODEL="Model Grok"
|
||||
COM_TESTQUESTIONS_AI_MODEL_INVALID="Wybierz prawidłowy model dla każdego dostawcy AI."
|
||||
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_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.42.8.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.42.9.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.43.0.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.43.1.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.43.2.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.43.3.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.43.4.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.43.5.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.43.6.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.7.1.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.8.0.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.8.1.
|
||||
@@ -0,0 +1 @@
|
||||
-- No database changes required for version 1.8.2.
|
||||
@@ -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,97 @@
|
||||
<?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
|
||||
{
|
||||
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'], true)) {
|
||||
throw new \RuntimeException(Text::_('COM_TESTQUESTIONS_AI_PROVIDER_INVALID'));
|
||||
}
|
||||
|
||||
$models = AiService::availableModels();
|
||||
$selectedModels = [];
|
||||
foreach (['openai', 'grok'] as $modelProvider) {
|
||||
$model = $input->post->getCmd('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'] 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']);
|
||||
|
||||
$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'));
|
||||
}
|
||||
|
||||
$this->setRedirect(
|
||||
Route::_('index.php?option=com_testquestions&view=ai', false),
|
||||
Text::_('COM_TESTQUESTIONS_AI_SETTINGS_SAVED')
|
||||
);
|
||||
}
|
||||
|
||||
public function cancel(): void
|
||||
{
|
||||
$this->setRedirect(Route::_('index.php?option=com_testquestions&view=questions', false));
|
||||
}
|
||||
}
|
||||
@@ -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'));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user