step 7: filters added

Author: olyapka84

pyproject.toml

@@ -21,6 +21,7 @@ dependencies = [
   "pytest>=8.4.2",
   "pytest-django>=4.11.1",
   "psycopg2-binary>=2.9.10",
+  "django-filter>=25.2",
 ]
 
 [dependency-groups]

task_manager/settings.py

@@ -43,6 +43,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django_filters',
     'django_bootstrap5',
     'task_manager.users',
     'task_manager.tasks',

task_manager/tasks/filters.py

@@ -0,0 +1,47 @@
+# tasks/filters.py
+import django_filters as df
+from django import forms
+from django.contrib.auth import get_user_model
+from .models import Task
+from task_manager.statuses.models import Status
+from task_manager.labels.models import Label
+
+User = get_user_model()
+
+
+class TaskFilter(df.FilterSet):
+    status = df.ModelChoiceFilter(
+        queryset=Status.objects.all().order_by("id"),
+        label="Статус",
+        widget=forms.Select(attrs={"class": "form-select"}),
+    )
+    executor = df.ModelChoiceFilter(
+        queryset=User.objects.all().order_by("id"),
+        label="Исполнитель",
+        widget=forms.Select(attrs={"class": "form-select"}),
+    )
+    label = df.ModelChoiceFilter(
+        field_name="labels",
+        queryset=Label.objects.all().order_by("id"),
+        label="Метка",
+        widget=forms.Select(attrs={"class": "form-select"}),
+    )
+    self_tasks = df.BooleanFilter(
+        method="filter_self_tasks",
+        label="Только свои задачи",
+        widget=forms.CheckboxInput(attrs={"class": "form-check-input"}),
+    )
+
+    class Meta:
+        model = Task
+        fields = ["status", "executor", "label", "self_tasks"]
+
+    def __init__(self, data=None, queryset=None, request=None, **kwargs):
+        super().__init__(data=data, queryset=queryset, request=request, **kwargs)
+        self.request = request
+        self.filters["executor"].field.label_from_instance = (
+            lambda u: (u.get_full_name().strip() if (u.get_full_name() or "").strip() else u.username)
+        )
+
+    def filter_self_tasks(self, queryset, name, value):
+        return queryset.filter(author=self.request.user) if value else queryset

task_manager/tasks/views.py

@@ -2,17 +2,28 @@
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 from django.shortcuts import redirect
 from django.urls import reverse_lazy
-from django.views.generic import ListView, CreateView, UpdateView, DeleteView, DetailView
+from django.views.generic import CreateView, UpdateView, DeleteView, DetailView
+from django_filters.views import FilterView
 
+from .filters import TaskFilter
 from .models import Task
 from .forms import TaskForm
 
 
-class TaskListView(LoginRequiredMixin, ListView):
+class TaskListView(LoginRequiredMixin, FilterView):
     model = Task
     template_name = "tasks/index.html"
     context_object_name = "tasks"
     login_url = "users:login"
+    filterset_class = TaskFilter
+
+    def get_queryset(self):
+        return (
+            super().get_queryset()
+            .select_related("status", "author", "executor")
+            .prefetch_related("labels")
+            .order_by("id")
+        )
 
 
 class TaskDetailView(LoginRequiredMixin, DetailView):

task_manager/templates/tasks/index.html

@@ -4,6 +4,38 @@ <h1>Задачи</h1>
 
 <p><a class="btn btn-primary" href="{% url 'tasks_create' %}">Создать задачу</a></p>
 
+{# Форма фильтров #}
+<form method="get" class="row g-2 align-items-end mb-3">
+  <div class="col-sm-3">
+    <label for="id_status" class="form-label">Статус</label>
+    {{ filter.form.status }}
+  </div>
+
+  <div class="col-sm-3">
+    <label for="id_executor" class="form-label">Исполнитель</label>
+    {{ filter.form.executor }}
+  </div>
+
+  <div class="col-sm-3">
+    <label for="id_label" class="form-label">Метка</label>
+    {{ filter.form.label }}
+  </div>
+
+  <div class="col-sm-3">
+    <div class="form-check mt-4">
+      {{ filter.form.self_tasks }}
+      <label class="form-check-label" for="{{ filter.form.self_tasks.id_for_label }}">
+        Только свои задачи
+      </label>
+    </div>
+  </div>
+
+  <div class="col-12">
+    <button type="submit" class="btn btn-primary">Показать</button>
+  </div>
+</form>
+
+
 <table class="table table-striped align-middle">
   <thead>
     <tr>
@@ -21,8 +53,14 @@ <h1>Задачи</h1>
       <td>{{ t.id }}</td>
       <td><a href="{% url 'tasks_detail' t.pk %}">{{ t.name }}</a></td>
       <td>{{ t.status }}</td>
-      <td>{{ t.author }}</td>
-      <td>{{ t.executor|default:"—" }}</td>
+      <td>{{ t.author.get_full_name|default:t.author.username }}</td>
+      <td>
+      {% if t.executor %}
+      {{ t.executor.get_full_name|default:t.executor.username }}
+      {% else %}
+      —
+      {% endif %}
+    </td>
       <td class="text-end">
         <a class="btn btn-sm btn-outline-secondary" href="{% url 'tasks_update' t.pk %}">Изменить</a>
         <a class="btn btn-sm btn-outline-danger" href="{% url 'tasks_delete' t.pk %}">Удалить</a>