AFPy/PonyConf
AFPy/PonyConf
7
2
Fork 3
Code Issues 10 Pull Requests 1 Projects Releases Wiki Activity

talk score is now average notes

Browse Source
This commit is contained in:
Élie Bouttier 2016-09-16 18:12:21 +02:00
parent b3e5d1207f
commit a48553422f
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
locale/fr/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -45,7 +45,7 @@ msgstr "Besoin d'un hébergement ?"
msgid "Ok for homestay?" msgid "Ok for homestay?"
msgstr "Ok pour un logement chez l'habitant ?" 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" msgid "Constraints"
msgstr "Contraintes" msgstr "Contraintes"
@ -474,8 +474,12 @@ msgid "Vote:"
msgstr "Vote :" msgstr "Vote :"
#: proposals/templates/proposals/talk_detail.html:64 #: proposals/templates/proposals/talk_detail.html:64
msgid "Sum:" msgid "vote"
msgstr "Somme :" msgstr "vote"
#: proposals/templates/proposals/talk_detail.html:64
msgid "average:"
msgstr "moyenne :"
#: proposals/templates/proposals/talk_detail.html:66 #: proposals/templates/proposals/talk_detail.html:66
msgid "Status:" msgid "Status:"

5
proposals/models.py
View File

@ -91,7 +91,10 @@ class Talk(PonyConfModel):
return user == self.proposer or user in self.speakers.all() or self.is_moderable_by(user) return user == self.proposer or user in self.speakers.all() or self.is_moderable_by(user)
def score(self): 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: class Meta:
ordering = ('event__id',) ordering = ('event__id',)

4
proposals/templates/proposals/talk_detail.html
View File

@ -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 == 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> <a class="btn {% if vote.vote == 2 %} active {% endif %}btn-success" href="{% url 'vote' talk=talk.slug score='2' %}">+2</a>
</div> </div>
<br /><br />
{% trans "Sum:" %} {{ talk.score }} {{ talk.vote_set.all|length }} {% trans "vote" %}{{ talk.vote_set.all|length|pluralize }}, {% trans "average:" %} {{ talk.score }}
<h3>{% trans "Status:" %}</h3> <h3>{% trans "Status:" %}</h3>