From f3dd5f6cff7d20c5540811ff8070643d62baae70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Thu, 13 Oct 2016 22:04:22 +0200
Subject: [PATCH] improve speaker talks count

---
 accounts/models.py                              | 13 +++++++++++++
 proposals/templates/proposals/speaker_list.html |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/accounts/models.py b/accounts/models.py
index bcdfcb4..65f4a34 100644
--- a/accounts/models.py
+++ b/accounts/models.py
@@ -108,6 +108,19 @@ class Participation(PonyConfModel):
     def talk_set(self):
         return self.user.talk_set.filter(site=self.site)
 
+    @property
+    def accepted_talk_set(self):
+        return self.talk_set.filter(accepted=True)
+    @property
+    def pending_talk_set(self):
+        return self.talk_set.filter(accepted=None)
+    @property
+    def refused_talk_set(self):
+        return self.talk_set.filter(accepted=False)
+    @property
+    def not_refused_talk_set(self): # accepted + pending
+        return self.talk_set.exclude(accepted=False)
+
     # return True, False or None if availabilities have not been filled
     def is_available(self, start, end=None):
         if not self.availabilities.exists():
diff --git a/proposals/templates/proposals/speaker_list.html b/proposals/templates/proposals/speaker_list.html
index a7bf4ba..800ebb0 100644
--- a/proposals/templates/proposals/speaker_list.html
+++ b/proposals/templates/proposals/speaker_list.html
@@ -52,7 +52,7 @@
         <tr class="clickable-row" data-href="{% url 'show-speaker' username=speaker.user.username %}">
             <td>{{ speaker.user.username }}</td>
             <td>{{ speaker.user.get_full_name }}</td>
-            <td class="text-right">{{ speaker.talk_set.count }}</td>
+            <td class="text-right">{{ speaker.not_refused_talk_set.count }}{% if speaker.pending_talk_set.count %} ({{ speaker.pending_talk_set.count }} pending){% endif %}</td>
             {% if speaker.need_transport %}
             <td class="{% if speaker.transport_booked %}success{% else %}warning{% endif %}">
                 {% for transport in speaker.transport.all %}