From 84aa7e637bb03b2fb014f2b31e8a5cdeab82233a Mon Sep 17 00:00:00 2001
From: Wojtek <wojtek@localhost>
Date: Thu, 15 Oct 2026 18:37:32 +0200
Subject: [PATCH] Add automatic test countdown timer

---
 README.md                                     |  3 +-
 .../sql/updates/mysql/1.16.0.sql              |  1 +
 com_testquestions.xml                         |  2 +-
 .../language/en-GB/com_testquestions.ini      |  1 +
 .../com_testquestions/tmpl/set/default.php    | 54 ++++++++++++++++++-
 5 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 administrator/components/com_testquestions/sql/updates/mysql/1.16.0.sql

diff --git a/README.md b/README.md
index 5be3247..3213966 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ Szkielet komponentu Joomla 6 do gromadzenia pytań testowych.
 - 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,
 - 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,
@@ -26,6 +27,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.15.2).
+W Joomla wybierz **System → Install → Install from Folder** i wskaż ten katalog. Manifestem instalacyjnym jest `com_testquestions.xml` (wersja 1.16.0).
 
 Po instalacji komponent jest dostępny w panelu administratora jako **Pytania testowe**.
diff --git a/administrator/components/com_testquestions/sql/updates/mysql/1.16.0.sql b/administrator/components/com_testquestions/sql/updates/mysql/1.16.0.sql
new file mode 100644
index 0000000..adf308c
--- /dev/null
+++ b/administrator/components/com_testquestions/sql/updates/mysql/1.16.0.sql
@@ -0,0 +1 @@
+-- No database changes required for version 1.16.0.
diff --git a/com_testquestions.xml b/com_testquestions.xml
index c59f533..81eb733 100644
--- a/com_testquestions.xml
+++ b/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.15.2</version>
+    <version>1.16.0</version>
     <description>COM_TESTQUESTIONS_DESCRIPTION</description>
     <element>com_testquestions</element>
     <namespace path="src">Komponent\Component\Testquestions</namespace>
diff --git a/components/com_testquestions/language/en-GB/com_testquestions.ini b/components/com_testquestions/language/en-GB/com_testquestions.ini
index 6f7548f..2bb86a7 100644
--- a/components/com_testquestions/language/en-GB/com_testquestions.ini
+++ b/components/com_testquestions/language/en-GB/com_testquestions.ini
@@ -26,3 +26,4 @@ COM_TESTQUESTIONS_PARTICIPANT_NAME="Login lub nazwa użytkownika"
 COM_TESTQUESTIONS_EXTRA_TIME="Przedłużenie czasu"
 COM_TESTQUESTIONS_START_TEST="Rozpocznij test"
 COM_TESTQUESTIONS_SET_START_HINT="Wybierz zestaw, wpisz login lub nazwę użytkownika i zatwierdź rozpoczęcie testu."
+COM_TESTQUESTIONS_TIMER_REMAINING="Pozostały czas"
diff --git a/components/com_testquestions/tmpl/set/default.php b/components/com_testquestions/tmpl/set/default.php
index ef92539..c02898a 100644
--- a/components/com_testquestions/tmpl/set/default.php
+++ b/components/com_testquestions/tmpl/set/default.php
@@ -46,11 +46,20 @@ use Joomla\CMS\Factory;
             <?php if ($this->set->image) : ?><div class="foto_pyt"><img src="<?php echo htmlspecialchars($this->set->image, ENT_QUOTES, 'UTF-8'); ?>" alt="" loading="lazy"></div><?php endif; ?>
             <?php if ($this->set->test_content) : ?><div class="test-set-content"><?php echo $this->set->test_content; ?></div><?php endif; ?>
         </header>
+        <?php if (!$this->results && ((int) $this->set->duration + $extraTime) > 0) : ?>
+            <div class="timer-container mb-4" id="test-timer-container" data-duration="<?php echo ((int) $this->set->duration + $extraTime) * 60; ?>" aria-live="polite">
+                <svg width="120" height="120" viewBox="0 0 120 120" aria-hidden="true">
+                    <circle cx="60" cy="60" r="54" fill="none" stroke="#dfe3e7" stroke-width="8"></circle>
+                    <circle id="test-timer-ring" class="progress-ring__circle" cx="60" cy="60" r="54" fill="none" stroke="#4a86cf" stroke-width="8" stroke-linecap="round"></circle>
+                </svg>
+                <div id="test-timer-text" class="timer-text">--:--</div>
+            </div>
+        <?php endif; ?>
         <?php if ($this->results) : ?>
             <div class="alert alert-success test-result"><strong><?php echo \Joomla\CMS\Language\Text::_('COM_TESTQUESTIONS_RESULT'); ?>:</strong> <?php echo (int) $this->results['correct']; ?> / <?php echo (int) $this->results['total']; ?> (<?php echo htmlspecialchars((string) $this->results['percentage'], ENT_QUOTES, 'UTF-8'); ?>%)</div>
         <?php endif; ?>
         <?php if ($this->items) : ?>
-            <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="post">
+            <form action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES, 'UTF-8'); ?>" method="post" id="test-form">
             <?php foreach ($this->items as $number => $item) : ?>
                 <article class="testquestion mb-4">
                     <div class="pyt"><div class="question-header"><span class="question-number"><?php echo ($number + 1) . '.'; ?></span><div class="question-text"><?php echo $item->question; ?></div></div></div>
@@ -96,3 +105,46 @@ use Joomla\CMS\Factory;
         <?php endif; ?>
     <?php endif; ?>
 </div>
+<?php if ($this->started && !$this->results && ((int) $this->set->duration + $extraTime) > 0) : ?>
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    const container = document.getElementById('test-timer-container');
+    const text = document.getElementById('test-timer-text');
+    const ring = document.getElementById('test-timer-ring');
+    const form = document.getElementById('test-form');
+
+    if (!container || !text || !ring || !form) {
+        return;
+    }
+
+    const total = parseInt(container.dataset.duration, 10);
+    const circumference = 2 * Math.PI * 54;
+    let remaining = total;
+    let submitted = false;
+
+    ring.style.strokeDasharray = circumference + ' ' + circumference;
+
+    const update = function () {
+        const minutes = Math.floor(remaining / 60);
+        const seconds = remaining % 60;
+        text.textContent = String(minutes).padStart(2, '0') + ':' + String(seconds).padStart(2, '0');
+        ring.style.strokeDashoffset = circumference * (1 - remaining / total);
+
+        if (remaining <= 0 && !submitted) {
+            submitted = true;
+            form.submit();
+        }
+    };
+
+    update();
+    const interval = window.setInterval(function () {
+        remaining -= 1;
+        update();
+
+        if (submitted) {
+            window.clearInterval(interval);
+        }
+    }, 1000);
+});
+</script>
+<?php endif; ?>