From 439e8676fdab38012ed1b5b90f03a6fda24bb6bf Mon Sep 17 00:00:00 2001
From: Dmitry Novikov <nerosketch@gmail.com>
Date: Tue, 27 Feb 2018 17:29:03 +0300
Subject: [PATCH] Add comment count to task list

---
 taskapp/locale/ru/LC_MESSAGES/django.po     | 4 ++++
 taskapp/templates/taskapp/tasklist.html     | 3 ++-
 taskapp/templates/taskapp/tasklist_all.html | 3 ++-
 taskapp/views.py                            | 5 ++++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/taskapp/locale/ru/LC_MESSAGES/django.po b/taskapp/locale/ru/LC_MESSAGES/django.po
index 23dd5c5..acf2fd3 100644
--- a/taskapp/locale/ru/LC_MESSAGES/django.po
+++ b/taskapp/locale/ru/LC_MESSAGES/django.po
@@ -456,3 +456,7 @@ msgstr "Исполнители"
 
 msgid "Author does not specified"
 msgstr "Автор не указан"
+
+msgid "Name and comment count"
+msgstr "Имя и количество комментов"
+
diff --git a/taskapp/templates/taskapp/tasklist.html b/taskapp/templates/taskapp/tasklist.html
index 60b20e7..4171d95 100644
--- a/taskapp/templates/taskapp/tasklist.html
+++ b/taskapp/templates/taskapp/tasklist.html
@@ -7,7 +7,7 @@
         <table class="table table-striped table-bordered">
             <thead>
             <tr>
-                <th class="col-sm-3">{% trans 'Name' %}</th>
+                <th class="col-sm-3">{% trans 'Name and comment count' %}</th>
                 <th class="col-sm-1">{% trans 'Address' %}</th>
                 <th class="col-sm-1">{% trans 'The nature of the damage' %}</th>
                 <th class="col-sm-4">{% trans 'Description' %}</th>
@@ -40,6 +40,7 @@
                         <a href="{% url 'abonapp:abon_home' task.abon.group.pk task.abon.pk %}" title="{{ task.abon.description|default:'' }}" data-toggle="tooltip">
                             {{ task.abon.get_full_name }}
                         </a>
+                        {% if task.comment_count > 0 %}({{ task.comment_count }}){% endif %}
                     </td>
                     <td>
                         {{ task.abon.group.title }}, {{ task.abon.street|default:'' }} {{ task.abon.house|default:'' }}
diff --git a/taskapp/templates/taskapp/tasklist_all.html b/taskapp/templates/taskapp/tasklist_all.html
index 6e6b34b..7b9d5f8 100644
--- a/taskapp/templates/taskapp/tasklist_all.html
+++ b/taskapp/templates/taskapp/tasklist_all.html
@@ -19,7 +19,7 @@
         <table class="table table-striped table-bordered">
             <thead>
             <tr>
-                <th class="col-sm-2">{% trans 'Name' %}</th>
+                <th class="col-sm-2">{% trans 'Name and comment count' %}</th>
                 <th class="col-sm-2">{% trans 'Address' %}</th>
                 <th class="col-sm-1">{% trans 'The nature of the damage' %}</th>
                 <th class="col-sm-3">{% trans 'Description' %}</th>
@@ -53,6 +53,7 @@
                         <a href="{% url 'abonapp:abon_home' task.abon.group.pk task.abon.pk %}">
                             {{ task.abon.get_full_name }}
                         </a>
+                        {% if task.comment_count > 0 %}({{ task.comment_count }}){% endif %}
 
                     </td>
                     <td>{{ task.abon.group.title }}, {{ task.abon.street|default:_('Not assigned') }} {{ task.abon.house|default:_('Not assigned') }}</td>
diff --git a/taskapp/views.py b/taskapp/views.py
index 68d3db0..ea1eebb 100644
--- a/taskapp/views.py
+++ b/taskapp/views.py
@@ -3,6 +3,7 @@ from json import dumps
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import PermissionDenied
 from django.http import HttpResponse
+from django.db.models import Count
 from django.shortcuts import redirect, get_object_or_404, resolve_url
 from django.contrib import messages
 from django.utils.decorators import method_decorator
@@ -37,6 +38,7 @@ class NewTasksView(BaseTaskListView):
 
     def get_queryset(self):
         return Task.objects.filter(recipients=self.request.user, state='S') \
+                           .annotate(comment_count=Count('extracomment')) \
                            .select_related('abon', 'abon__street', 'abon__group', 'author')
 
 
@@ -85,7 +87,8 @@ class AllTasksListView(BaseTaskListView):
     context_object_name = 'tasks'
 
     def get_queryset(self):
-        return Task.objects.select_related('abon', 'abon__street', 'abon__group', 'author')
+        return Task.objects.annotate(comment_count=Count('extracomment')) \
+                           .select_related('abon', 'abon__street', 'abon__group', 'author')
 
 
 @login_required