From cefcb6b7300eb2a8e4cf4993bcfbe0c502bceae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=9D=D0=B0=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=B8=D0=BD?= <nadein-igor-vladimirovich@05-04-1999.ru>
Date: Mon, 29 Dec 2025 15:42:00 +0300
Subject: [PATCH] =?UTF-8?q?fix(requests):=20=D1=83=D0=BB=D1=83=D1=87=D1=88?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=B4=D0=B0=D1=82=20=D0=B8=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/api/v1/requests_app/views.py         | 14 +++++++++++++-
 backend/templates/requests_app/_filters.html |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/backend/api/v1/requests_app/views.py b/backend/api/v1/requests_app/views.py
index be3e24d3..6d97fdc5 100644
--- a/backend/api/v1/requests_app/views.py
+++ b/backend/api/v1/requests_app/views.py
@@ -223,13 +223,25 @@ class RequestViewSet(viewsets.ModelViewSet):
 
             qs = qs.filter(scope).distinct()
 
-        # Применяем фильтры type/status для всех пользователей
+        # Применяем фильтры type/status/employee_id/date_from/date_to для всех пользователей
         t = (params.get("type") or "").strip()
         s = (params.get("status") or "").strip()
+        employee_id = (params.get("employee_id") or "").strip()
+        date_from = (params.get("date_from") or "").strip()
+        date_to = (params.get("date_to") or "").strip()
+        
         if t:
             qs = qs.filter(type=t)
         if s:
             qs = qs.filter(status=s)
+        if employee_id and employee_id.isdigit():
+            qs = qs.filter(employee_id=int(employee_id))
+        if date_from:
+            # Фильтр по дате создания (created_at >= указанной даты)
+            qs = qs.filter(created_at__date__gte=date_from)
+        if date_to:
+            # Фильтр по дате создания (created_at <= указанной даты)
+            qs = qs.filter(created_at__date__lte=date_to)
 
         return qs
 
diff --git a/backend/templates/requests_app/_filters.html b/backend/templates/requests_app/_filters.html
index d97c5fe1..32ea6ff2 100644
--- a/backend/templates/requests_app/_filters.html
+++ b/backend/templates/requests_app/_filters.html
@@ -40,11 +40,11 @@
     </select>
   </div>
   <div class="col-12 col-sm-6 col-md-3">
-    <label class="form-label mb-1">Период с</label>
+    <label class="form-label mb-1">Создано с</label>
     <input type="date" name="date_from" class="form-control" value="{{ filters.date_from|default:'' }}">
   </div>
   <div class="col-12 col-sm-6 col-md-3">
-    <label class="form-label mb-1">Период по</label>
+    <label class="form-label mb-1">Создано по</label>
     <input type="date" name="date_to" class="form-control" value="{{ filters.date_to|default:'' }}">
   </div>
   <div class="col-12 col-sm-6 col-md-3 d-flex align-items-end gap-2">