Fix tasks

Author: Pryanik0071

locale/ru/LC_MESSAGES/django.mo

@@ -169,7 +169,7 @@ msgstr "Задача успешно создана"
 
 #: task_manager/tasks/views.py:64
 msgid "Update task"
-msgstr "Изменение статуса"
+msgstr "Изменение задачи"
 
 #: task_manager/tasks/views.py:79
 msgid "Task successfully changed"

locale/ru/LC_MESSAGES/django.po

@@ -20,7 +20,8 @@
 
 
 urlpatterns = [
-    path('', views.IndexView.as_view(), name='tasks'),
+    path('', views.IndexViewList.as_view(), name='tasks'),
+    path('<int:pk>/', views.IndexView.as_view(), name='task'),
     path('create/', views.CreateView.as_view(), name='tasks_create'),
     path('<int:pk>/update/', views.UpdateView.as_view(), name='tasks_update'),
     path('<int:pk>/delete/', views.DeleteView.as_view(), name='tasks_delete'),

task_manager/tasks/urls.py

@@ -15,7 +15,7 @@ def get_task(self):
         return get_object_or_404(Task, pk=pk)
 
 
-class IndexView(CustomLoginRequiredMixin, FilterView):
+class IndexViewList(CustomLoginRequiredMixin, FilterView):
     template_name = 'tasks/index.html'
     model = Task
     filterset_class = TaskFilter
@@ -26,6 +26,14 @@ class IndexView(CustomLoginRequiredMixin, FilterView):
     }
 
 
+class IndexView(BaseTaskView):
+    template = 'tasks/task.html'
+
+    def get(self, request, *args, **kwargs):
+        task = self.get_task()
+        return render(request, self.template, {'task': task})
+
+
 class CreateView(CustomLoginRequiredMixin):
 
     template = 'form.html'

task_manager/tasks/views.py

@@ -39,7 +39,7 @@ <h1 class="my-4">{% trans 'Tasks' %}</h1>
         {% for task in tasks %}
         <tr>
           <td>{{ task.id }}</td>
-          <td>{{ task.name }}</td>
+          <td><a href="{% url 'task' pk=task.id %}">{{ task.name }}</a></td>
           <th>{{ task.status }}</th>
           <th>{{ task.author.first_name }} {{ task.author.last_name }}</th>
           <th>{{ task.executor.first_name }} {{ task.executor.last_name }}</th>

task_manager/templates/tasks/index.html

@@ -0,0 +1,56 @@
+{% extends "base.html" %}
+
+{% load i18n %}
+
+{% load django_bootstrap5 %}
+
+{% block content %}
+
+  <div class="container wrapper flex-grow-1">
+    <h1 class="my-4">Просмотр задачи</h1>
+    <div class="card">
+      <div class="card-header bg-secondary text-white">
+        <h2>Имя</h2>
+      </div>
+      <div class="card-body bg-light">
+        <p>Описание</p>
+        <hr>
+        <div class="container">
+          <div class="row p-1">
+            <div class="col">{% trans 'Author' %}</div>
+            <div class="col">{{ task.author.first_name }} {{ task.author.last_name }}</div>
+          </div>
+          <div class="row p-1">
+            <div class="col">{% trans 'Executor' %}</div>
+            <div class="col">{{ task.executor.first_name }} {{ task.executor.last_name }}</div>
+          </div>
+          <div class="row p-1">
+            <div class="col">{% trans 'Status' %}</div>
+            <div class="col">{{ task.status }}</div>
+          </div>
+          <div class="row p-1">
+            <div class="col">{% trans 'Date' %}</div>
+            <div class="col">{{ task.inserted_timestamp|date:"d.m.Y H:i" }}</div>
+          </div>
+          <div class="row p-1">
+            <div class="col">
+              <h6>Метки:</h6>
+              {% for label in task.labels.all %}
+                <ul>
+                  <li>{{ label.name }}</li>
+                </ul>
+              {% endfor %}
+            </div>
+          </div>
+          <div class="row p-1">
+            <div class="col">
+              <a href="{% url 'tasks_update' pk=task.id %}">{% trans 'Edit' %}</a>
+              <br>
+              <a href="{% url 'tasks_delete' pk=task.id %}">{% trans 'Delete' %}</a>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock %}