From 4580ff1d3e6c5aa7275a2f18d80e0379fc7694a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=A7=D0=B5=D1=80=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BA=D0=BE?= <y.chernenko@tvstart.ru>
Date: Mon, 22 Jun 2026 18:04:54 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B5=20?=
 =?UTF-8?q?=D1=82=D1=83=D1=80=D0=B0=20=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B3=D0=B0=D0=BB=D0=BE=D1=87=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=97=D0=B0=D0=B2=D0=B5=D1=80=D1=88=D0=B5=D0=BD=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B5=20=D0=BC=D0=B0=D1=82=D1=87=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.py                 | 10 ++++++++--
 templates/matches.html | 20 +++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/app.py b/app.py
index fca0d87..5f49eee 100644
--- a/app.py
+++ b/app.py
@@ -602,9 +602,15 @@ def admin_matches(
     request: Request,
     today_only: bool = Query(default=False),
     tour: str | None = Query(default=None),
-    hide_finished: str = Query(default="true"),
+    hide_finished: str | None = Query(default=None),
 ):
-    hide_finished_bool = str(hide_finished).lower() == "true"
+    # По умолчанию завершённые матчи скрываем.
+    # Но если оператор выбрал конкретный тур, показываем все матчи тура,
+    # поэтому чекбокс «Завершенные матчи» автоматически снимается.
+    if hide_finished is None:
+        hide_finished_bool = False if tour else True
+    else:
+        hide_finished_bool = str(hide_finished).lower() == "true"
 
     matches = list_matches_for_admin(
         today_only=today_only,
diff --git a/templates/matches.html b/templates/matches.html
index cb0f812..91d0323 100644
--- a/templates/matches.html
+++ b/templates/matches.html
@@ -408,7 +408,7 @@
                 <select
                     name="tour"
                     id="tour"
-                    onchange="document.getElementById('filters-form').submit();"
+                    onchange="submitFiltersAfterTourChange();"
                 >
                     <option value="">Все туры</option>
                     {% for t in tours %}
@@ -424,6 +424,7 @@
                     <input
                         type="checkbox"
                         name="hide_finished"
+                        id="hideFinishedCheckbox"
                         value="true"
                         {% if hide_finished %}checked{% endif %}
                         onchange="document.getElementById('filters-form').submit();"
@@ -486,6 +487,23 @@
             {% endif %}
         </div>
     </div>
+<script>
+    function submitFiltersAfterTourChange() {
+        const form = document.getElementById("filters-form");
+        const tourSelect = document.getElementById("tour");
+        const hideFinishedCheckbox = document.getElementById("hideFinishedCheckbox");
+
+        if (tourSelect && hideFinishedCheckbox) {
+            // Выбран конкретный тур — показываем в нём все матчи, включая завершённые.
+            // Выбраны «Все туры» — снова скрываем завершённые матчи.
+            hideFinishedCheckbox.checked = !tourSelect.value;
+        }
+
+        if (form) {
+            form.submit();
+        }
+    }
+</script>
     <div id="matrixLoader" class="matrix-loader" aria-hidden="true">
     <canvas id="matrixCanvas" class="matrix-canvas"></canvas>
     <div class="matrix-content">