Sync variant publication with parent set

README.md

@@ -30,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.43.8).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.43.13).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.

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

@@ -46,6 +46,9 @@ 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"
@@ -62,6 +65,7 @@ COM_TESTQUESTIONS_SET_REORDER_INFO="Przeciągnij pytania, aby zmienić ich kolej
 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"
@@ -106,6 +110,8 @@ 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"

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

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

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/Model/ResultsModel.php

@@ -9,6 +9,107 @@ use Joomla\CMS\MVC\Model\ListModel;
 
 class ResultsModel extends ListModel
 {
+    public function getItems()
+    {
+        $items = parent::getItems();
+
+        foreach ($items as $item) {
+            $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];
+
+            $answers = json_decode((string) ($item->answers ?? ''), 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;
+                    }
+                    $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],
+        ];
+
+        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);

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);
@@ -136,6 +156,7 @@ class SetModel extends AdminModel
             $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';
@@ -151,6 +172,15 @@ class SetModel extends AdminModel
 
         $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'))

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

@@ -15,6 +15,7 @@ class HtmlView extends BaseHtmlView
     protected $pagination;
     protected $state;
     protected $sets;
+    protected $aiUsageTotals;
 
     public function display($tpl = null)
     {
@@ -22,6 +23,7 @@ class HtmlView extends BaseHtmlView
         $this->pagination = $this->get('Pagination');
         $this->state = $this->get('State');
         $this->sets = $this->get('Sets');
+        $this->aiUsageTotals = $this->get('AiUsageTotals');
         ToolbarHelper::title(Text::_('COM_TESTQUESTIONS_RESULTS'));
         ToolbarHelper::link('index.php?option=com_testquestions&view=sets', 'COM_TESTQUESTIONS_SETS', 'back');
 

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

@@ -15,6 +15,7 @@ class HtmlView extends BaseHtmlView
     protected $pagination;
     protected $state;
     protected $subjects;
+    protected $canUnpublishAll = false;
 
     public function display($tpl = null)
     {
@@ -22,6 +23,8 @@ class HtmlView extends BaseHtmlView
         $this->pagination = $this->get('Pagination');
         $this->state = $this->get('State');
         $this->subjects = $this->get('Subjects');
+        $user = $this->getCurrentUser();
+        $this->canUnpublishAll = $user->authorise('core.edit.state', 'com_testquestions') || $user->authorise('core.edit', 'com_testquestions');
 
         if (count($errors = $this->get('Errors'))) {
             throw new \RuntimeException(implode("\n", $errors));

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

@@ -33,6 +33,24 @@ use Joomla\CMS\Router\Route;
         </div>
         <div class="col-md-3 align-self-end"><button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button></div>
     </div>
+    <div class="alert alert-info" role="status">
+        <strong><?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULTS_AI_TOKENS_TOTAL')); ?>:</strong>
+        <span class="d-block">
+            <strong>OpenAI:</strong>
+            <?php echo number_format((int) $this->aiUsageTotals['providers']['openai']['total_tokens'], 0, ',', ' '); ?> tokenów
+            (<?php echo number_format((int) $this->aiUsageTotals['providers']['openai']['input_tokens'], 0, ',', ' '); ?> wej. /
+            <?php echo number_format((int) $this->aiUsageTotals['providers']['openai']['output_tokens'], 0, ',', ' '); ?> wyj.)
+            <?php if ($this->aiUsageTotals['providers']['openai']['cost_usd'] > 0) : ?> · <?php echo number_format((float) $this->aiUsageTotals['providers']['openai']['cost_usd'], 8, ',', ' '); ?> USD<?php endif; ?>
+        </span>
+        <span class="d-block">
+            <strong>Grok:</strong>
+            <?php echo number_format((int) $this->aiUsageTotals['providers']['grok']['total_tokens'], 0, ',', ' '); ?> tokenów
+            (<?php echo number_format((int) $this->aiUsageTotals['providers']['grok']['input_tokens'], 0, ',', ' '); ?> wej. /
+            <?php echo number_format((int) $this->aiUsageTotals['providers']['grok']['output_tokens'], 0, ',', ' '); ?> wyj.)
+            <?php if ($this->aiUsageTotals['providers']['grok']['cost_usd'] > 0) : ?> · <?php echo number_format((float) $this->aiUsageTotals['providers']['grok']['cost_usd'], 8, ',', ' '); ?> USD<?php endif; ?>
+        </span>
+        <span class="d-block"><strong>Łącznie:</strong> <?php echo number_format((int) $this->aiUsageTotals['total_tokens'], 0, ',', ' '); ?> tokenów</span>
+    </div>
     <table class="table table-striped">
         <thead><tr>
             <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_PARTICIPANT'); ?></th>
@@ -41,6 +59,7 @@ use Joomla\CMS\Router\Route;
             <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_GRADE'); ?></th>
             <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_EXECUTION_TIME'); ?></th>
             <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_DATE'); ?></th>
+            <th><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT_AI_TOKENS'); ?></th>
         </tr></thead>
         <tbody>
         <?php foreach ($this->items as $item) : ?>
@@ -58,6 +77,20 @@ use Joomla\CMS\Router\Route;
                 <td><?php echo $this->escape($grade); ?></td>
                 <td><?php echo floor((int) $item->execution_time / 60); ?>:<?php echo str_pad((string) ((int) $item->execution_time % 60), 2, '0', STR_PAD_LEFT); ?></td>
                 <td><?php echo HTMLHelper::_('date', $item->created, 'Y-m-d H:i'); ?></td>
+                <td>
+                    <?php if ($item->ai_total_tokens > 0) : ?>
+                        <small class="d-block text-muted">
+                            OpenAI: <?php echo number_format((int) $item->ai_tokens_by_provider['openai'], 0, ',', ' '); ?> ·
+                            Grok: <?php echo number_format((int) $item->ai_tokens_by_provider['grok'], 0, ',', ' '); ?>
+                        </small>
+                        <small class="d-block text-muted">
+                            <?php echo number_format((int) $item->ai_total_tokens, 0, ',', ' '); ?> łącznie
+                            <?php if ($item->ai_cost_usd > 0) : ?> · <?php echo number_format((float) $item->ai_cost_usd, 8, ',', ' '); ?> USD<?php endif; ?>
+                        </small>
+                    <?php else : ?>
+                        —
+                    <?php endif; ?>
+                </td>
             </tr>
         <?php endforeach; ?>
         </tbody>

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

@@ -28,7 +28,11 @@ HTMLHelper::_('behavior.formvalidator');
         <?php echo $this->form->renderField('test_content'); ?>
         <?php echo $this->form->renderField('image'); ?>
         <?php echo $this->form->renderField('description'); ?>
-        <?php echo $this->form->renderField('published'); ?>
+        <?php if ($this->isVariant) : ?>
+            <div class="alert alert-info"><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANT_STATUS_INHERITED'); ?></div>
+        <?php else : ?>
+            <?php echo $this->form->renderField('published'); ?>
+        <?php endif; ?>
         <?php if ((int) $this->item->id > 0 && (string) $this->item->set_type === 'multi') : ?>
             <fieldset class="mb-3">
                 <legend><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SET_VARIANTS'); ?></legend>

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

@@ -30,6 +30,11 @@ HTMLHelper::_('behavior.multiselect');
         <div class="col-md-3">
             <button type="submit" class="btn btn-primary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_SUBMIT'); ?></button>
             <a href="<?php echo Route::_('index.php?option=com_testquestions&view=sets'); ?>" class="btn btn-secondary"><?php echo \Joomla\CMS\Language\Text::_('JSEARCH_FILTER_CLEAR'); ?></a>
+            <?php if ($this->canUnpublishAll) : ?>
+                <button type="submit" class="btn btn-warning" data-confirm="<?php echo $this->escape(\Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL_CONFIRM')); ?>" onclick="if (!confirm(this.dataset.confirm)) { return false; } this.form.task.value='sets.unpublishall';">
+                    <?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_SETS_UNPUBLISH_ALL'); ?>
+                </button>
+            <?php endif; ?>
         </div>
     </div>
 

com_testquestions.xml

@@ -4,7 +4,7 @@
     <creationDate>2026-10-14</creationDate>
     <author>Komponent</author>
     <license>GNU General Public License version 2 or later</license>
-    <version>1.43.8</version>
+    <version>1.43.13</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>