From a48553422fd55efd9788a3f6457eb86cf04223b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Fri, 16 Sep 2016 18:12:21 +0200
Subject: [PATCH] talk score is now average notes

---
 locale/fr/LC_MESSAGES/django.po                | 12 ++++++++----
 proposals/models.py                            |  5 ++++-
 proposals/templates/proposals/talk_detail.html |  4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 14f9fcd..1f67d81 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-14 20:52+0000\n"
+"POT-Creation-Date: 2016-09-16 16:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,7 +45,7 @@ msgstr "Besoin d'un hébergement ?"
 msgid "Ok for homestay?"
 msgstr "Ok pour un logement chez l'habitant ?"
 
-#: accounts/models.py:62
+#: accounts/models.py:62 proposals/templates/proposals/user_details.html:42
 msgid "Constraints"
 msgstr "Contraintes"
 
@@ -474,8 +474,12 @@ msgid "Vote:"
 msgstr "Vote :"
 
 #: proposals/templates/proposals/talk_detail.html:64
-msgid "Sum:"
-msgstr "Somme :"
+msgid "vote"
+msgstr "vote"
+
+#: proposals/templates/proposals/talk_detail.html:64
+msgid "average:"
+msgstr "moyenne :"
 
 #: proposals/templates/proposals/talk_detail.html:66
 msgid "Status:"
diff --git a/proposals/models.py b/proposals/models.py
index 558c1cc..9460103 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -91,7 +91,10 @@ class Talk(PonyConfModel):
         return user == self.proposer or user in self.speakers.all() or self.is_moderable_by(user)
 
     def score(self):
-        return query_sum(self.vote_set, 'vote')
+        if self.vote_set.exists():
+            return query_sum(self.vote_set, 'vote') / len(self.vote_set.all())
+        else:
+            return 0
 
     class Meta:
         ordering = ('event__id',)
diff --git a/proposals/templates/proposals/talk_detail.html b/proposals/templates/proposals/talk_detail.html
index 11605aa..3601aa8 100644
--- a/proposals/templates/proposals/talk_detail.html
+++ b/proposals/templates/proposals/talk_detail.html
@@ -60,8 +60,8 @@
   <a class="btn {% if vote.vote == 1 %}  active {% endif %}btn-info"    href="{% url 'vote' talk=talk.slug score='1'  %}">+1</a>
   <a class="btn {% if vote.vote == 2 %}  active {% endif %}btn-success" href="{% url 'vote' talk=talk.slug score='2'  %}">+2</a>
 </div>
-
-{% trans "Sum:" %} {{ talk.score }}
+<br /><br />
+{{ talk.vote_set.all|length }} {% trans "vote" %}{{ talk.vote_set.all|length|pluralize }}, {% trans "average:" %} {{ talk.score }}
 
 <h3>{% trans "Status:" %}</h3>