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 @@ {{ speaker.user.username }} {{ speaker.user.get_full_name }} - {{ speaker.talk_set.count }} + {{ speaker.not_refused_talk_set.count }}{% if speaker.pending_talk_set.count %} ({{ speaker.pending_talk_set.count }} pending){% endif %} {% if speaker.need_transport %} {% for transport in speaker.transport.all %}