@@ -56,6 +62,18 @@ HTMLHelper::_('behavior.multiselect');
escape(strip_tags($item->question)); ?>
image) : ?>
+ state->get('filter.show_answers') === 1) : ?>
+
+ question_type === 'open') : ?>
+
: answer_open; ?>
+
+
A: answer_a; ?>
+
B: answer_b; ?>
+
C: answer_c; ?>
+
D: answer_d; ?>
+
+
+
question_type)); ?> |
correct_answer)); ?> |
diff --git a/com_testquestions.xml b/com_testquestions.xml
index 33a6eb1..00025e0 100644
--- a/com_testquestions.xml
+++ b/com_testquestions.xml
@@ -4,7 +4,7 @@
2026-10-14
Komponent
GNU General Public License version 2 or later
-
1.4.2
+
1.6.1
COM_TESTQUESTIONS_DESCRIPTION
com_testquestions
Komponent\Component\Testquestions
diff --git a/components/com_testquestions/language/en-GB/com_testquestions.ini b/components/com_testquestions/language/en-GB/com_testquestions.ini
index 2132320..aa75e78 100644
--- a/components/com_testquestions/language/en-GB/com_testquestions.ini
+++ b/components/com_testquestions/language/en-GB/com_testquestions.ini
@@ -1,2 +1,12 @@
COM_TESTQUESTIONS="Pytania testowe"
+COM_TESTQUESTIONS_TEST_SYMBOL="Symbol arkusza egzaminacyjnego"
+COM_TESTQUESTIONS_SELECT_TEST_SYMBOL="Wybierz arkusz egzaminacyjny"
+COM_TESTQUESTIONS_SHOW_TEST="Pokaż pytania"
+COM_TESTQUESTIONS_NO_TEST_QUESTIONS="Nie znaleziono pytań dla podanego arkusza."
+COM_TESTQUESTIONS_TEST_SHEET="Arkusz"
+COM_TESTQUESTIONS_TIME_LIMIT="Czas"
+COM_TESTQUESTIONS_POINTS="Punkty"
+COM_TESTQUESTIONS_MENU_ITEM_TITLE="Arkusz egzaminacyjny"
+COM_TESTQUESTIONS_MENU_ITEM_DESCRIPTION="Wyświetla pytania z wybranego arkusza egzaminacyjnego."
+COM_TESTQUESTIONS_MENU_TEST_SYMBOL_DESC="Opcjonalnie wybierz symbol arkusza, który ma być wyświetlany po wejściu z menu."
COM_TESTQUESTIONS_ENTER_ANSWER="Wpisz odpowiedź"
diff --git a/components/com_testquestions/language/en-GB/com_testquestions.sys.ini b/components/com_testquestions/language/en-GB/com_testquestions.sys.ini
new file mode 100644
index 0000000..89e8afb
--- /dev/null
+++ b/components/com_testquestions/language/en-GB/com_testquestions.sys.ini
@@ -0,0 +1,3 @@
+COM_TESTQUESTIONS="Pytania testowe"
+COM_TESTQUESTIONS_MENU_ITEM_TITLE="Arkusz egzaminacyjny"
+COM_TESTQUESTIONS_MENU_ITEM_DESCRIPTION="Wyświetla pytania z wybranego arkusza egzaminacyjnego."
diff --git a/components/com_testquestions/src/Model/QuestionsModel.php b/components/com_testquestions/src/Model/QuestionsModel.php
index 522a3c4..d8d906e 100644
--- a/components/com_testquestions/src/Model/QuestionsModel.php
+++ b/components/com_testquestions/src/Model/QuestionsModel.php
@@ -9,13 +9,50 @@ use Joomla\CMS\MVC\Model\ListModel;
class QuestionsModel extends ListModel
{
+ protected function populateState($ordering = 'ordering', $direction = 'asc')
+ {
+ parent::populateState($ordering, $direction);
+ $menu = Factory::getApplication()->getMenu()->getActive();
+ $menuSymbol = $menu ? (string) $menu->getParams()->get('test_symbol', '') : '';
+ $symbol = Factory::getApplication()->getInput()->getString('test_symbol', $menuSymbol);
+ $this->setState('filter.test_symbol', trim($symbol));
+ }
+
protected function getListQuery()
{
$db = Factory::getContainer()->get('DatabaseDriver');
- return $db->getQuery(true)
- ->select(['question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'image'])
+ $query = $db->getQuery(true)
+ ->select(['question_type', 'question', 'answer_a', 'answer_b', 'answer_c', 'answer_d', 'answer_open', 'correct_answer', 'image', 'time_limit', 'points'])
->from($db->quoteName('#__testquestions_questions'))
->where($db->quoteName('published') . ' = 1')
->order($db->quoteName('ordering') . ' ASC, ' . $db->quoteName('id') . ' ASC');
+
+ $symbol = $this->getState('filter.test_symbol');
+
+ if ($symbol !== '') {
+ $query->where($db->quoteName('test_symbol') . ' = ' . $db->quote($symbol));
+ } else {
+ $query->where('1 = 0');
+ }
+
+ return $query;
+ }
+
+ public function getTestSymbols()
+ {
+ $db = Factory::getContainer()->get('DatabaseDriver');
+
+ return $db->setQuery(
+ $db->getQuery(true)
+ ->select([
+ $db->quoteName('test_symbol', 'value'),
+ $db->quoteName('test_symbol', 'text'),
+ ])
+ ->from($db->quoteName('#__testquestions_questions'))
+ ->where($db->quoteName('published') . ' = 1')
+ ->where($db->quoteName('test_symbol') . ' <> ' . $db->quote(''))
+ ->group($db->quoteName('test_symbol'))
+ ->order($db->quoteName('test_symbol') . ' ASC')
+ )->loadObjectList();
}
}
diff --git a/components/com_testquestions/src/View/Questions/HtmlView.php b/components/com_testquestions/src/View/Questions/HtmlView.php
index 32a1124..f5383bc 100644
--- a/components/com_testquestions/src/View/Questions/HtmlView.php
+++ b/components/com_testquestions/src/View/Questions/HtmlView.php
@@ -9,10 +9,14 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
class HtmlView extends BaseHtmlView
{
protected $items;
+ protected $symbol;
+ protected $symbols;
public function display($tpl = null)
{
$this->items = $this->get('Items');
+ $this->symbol = $this->get('State')->get('filter.test_symbol');
+ $this->symbols = $this->get('TestSymbols');
return parent::display($tpl);
}
}
diff --git a/components/com_testquestions/tmpl/questions/default.php b/components/com_testquestions/tmpl/questions/default.php
index 968a692..08862eb 100644
--- a/components/com_testquestions/tmpl/questions/default.php
+++ b/components/com_testquestions/tmpl/questions/default.php
@@ -6,12 +6,35 @@ use Joomla\CMS\HTML\HTMLHelper;
?>