From cc07dd4373da6cabcb8a8e3d0d5efd33b512925f Mon Sep 17 00:00:00 2001
From: ack <ack77@mail.ru>
Date: Sun, 19 Apr 2026 20:14:52 +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=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B5=D1=81=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 camlaps/templates/camlaps/job_list.html | 22 ++++++++++++++++------
 camlaps/views.py                        |  2 ++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/camlaps/templates/camlaps/job_list.html b/camlaps/templates/camlaps/job_list.html
index 309e228..def7e34 100644
--- a/camlaps/templates/camlaps/job_list.html
+++ b/camlaps/templates/camlaps/job_list.html
@@ -1,6 +1,9 @@
 {% extends 'base.html' %}
 
 {% block content %}
+{% if has_active_jobs %}
+    <meta http-equiv="refresh" content="5">
+{% endif %}
 <div class="d-flex justify-content-between align-items-center mb-4">
     <h2>Очередь задач</h2>
     <div class="d-flex gap-2">
@@ -56,12 +59,19 @@
                     <td>{{ job.get_sampling_preset_display }}</td>
                     <td>{{ job.fps }}</td>
                     <td>{{ job.get_status_display }}</td>
-                    <td>
-                        {% if job.status == 'success' %}
-                            100%
-                        {% else %}
-                            {{ job.progress_percent }}%
-                        {% endif %}
+                    <td style="min-width: 170px;">
+                        <div class="progress" role="progressbar" aria-valuenow="{{ job.progress_percent }}" aria-valuemin="0" aria-valuemax="100">
+                            <div
+                                class="progress-bar {% if job.status == 'error' %}bg-danger{% elif job.status == 'success' %}bg-success{% else %}progress-bar-striped progress-bar-animated{% endif %}"
+                                style="width: {% if job.status == 'success' %}100{% else %}{{ job.progress_percent }}{% endif %}%"
+                            >
+                                {% if job.status == 'success' %}
+                                    100%
+                                {% else %}
+                                    {{ job.progress_percent }}%
+                                {% endif %}
+                            </div>
+                        </div>
                     </td>
                     <td>
                         {% if job.status == 'error' and job.error_message %}
diff --git a/camlaps/views.py b/camlaps/views.py
index 1f25393..765e452 100644
--- a/camlaps/views.py
+++ b/camlaps/views.py
@@ -64,6 +64,7 @@ def job_list(request):
     if camera_id:
         qs = qs.filter(camera_id=camera_id)
     jobs = qs.order_by('-created_at')[:200]
+    has_active_jobs = qs.filter(status__in=[TimelapseJob.Status.PLANNED, TimelapseJob.Status.RUNNING]).exists()
     return render(
         request,
         'camlaps/job_list.html',
@@ -71,6 +72,7 @@ def job_list(request):
             'jobs': jobs,
             'queue_started': request.GET.get('started'),
             'retried': request.GET.get('retried'),
+            'has_active_jobs': has_active_jobs,
         },
     )