X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=main.py;h=3effbb2a410fd3c0dc2f25652e75940e8cdafad0;hb=136c353bf4a1c864d8efd90609732f2ba886b7e0;hp=c276c3753c3491e34bbc0c25fa23fa8673a5fc7e;hpb=16be4472e8582f8d8d966b625165ef2e57fc21df;p=cavote.git

diff --git a/main.py b/main.py
index c276c37..3effbb2 100755
--- a/main.py
+++ b/main.py
@@ -19,10 +19,10 @@ SECRET_KEY = '{J@uRKO,xO-PK7B,jF?>iHbxLasF9s#zjOoy=+:'
 DEBUG = True
 TITLE = u"Cavote FFDN"
 EMAIL = '"' + TITLE + '"' + ' <' + u"cavote@ffdn.org" + '>'
-BASEURL = "http://localhost:5000"
+BASEURL = "http://localhost:5000" # :TODO:maethor:120605: Find a cleaner way to do this
 VERSION = "cavote 0.0.1"
 SMTP_SERVER = "10.33.33.30"
-PATTERNS = {u'Oui/Non': [u'Oui', u'Non'], u'Oui/Non/Peut-être': [u'Oui', u'Non', u'Peut-être']}
+PATTERNS = {u'Oui/Non': [u'Oui', u'Non'], u'Oui/Non/Blanc': [u'Oui', u'Non', u'Blanc'], u'Oui/Non/Peut-être': [u'Oui', u'Non', u'Peut-être']}
 
 app = Flask(__name__)
 app.config.from_object(__name__)
@@ -323,7 +323,7 @@ def votes(votes):
     today = date.today()
     active_button = votes
     max_votes ='select id_group, count(*) as max_votes from user_group group by id_group'
-    basequery = 'select votes.*, max_votes from votes join (' + max_votes + ') as max_votes on votes.id_group = max_votes.id_group'
+    basequery = 'select votes.*, max_votes from votes left join (' + max_votes + ') as max_votes on votes.id_group = max_votes.id_group'
     nb_votes = 'select id_vote, count(*) as nb_votes from (select id_user, id_vote from user_choice join choices on id_choice = choices.id group by id_user, id_vote) group by id_vote'
     basequery = 'select * from (' + basequery + ') left join (' + nb_votes + ') on id = id_vote'
     basequery = 'select *, votes.id as voteid, groups.name as groupname from (' + basequery + ') as votes join groups on groups.id = id_group where is_open=1'
@@ -342,7 +342,8 @@ def votes(votes):
     for vote in votes:
         if not vote.get('nb_votes'):
             vote['nb_votes'] = 0 
-        vote['percent'] = int((float(vote['nb_votes']) / float(vote['max_votes'])) * 100)
+        if vote.get('max_votes'):
+            vote['percent'] = int((float(vote['nb_votes']) / float(vote['max_votes'])) * 100)
     return render_template('votes.html', votes=votes, active_button=active_button)
 
 #------
@@ -416,9 +417,11 @@ def vote(idvote):
             tmp = query_db('select id_vote, count(*) as nb from (select id_user, id_vote from user_choice join choices on id_choice = choices.id group by id_user, id_vote) where id_vote = ? group by id_vote', [idvote], one=True)
             if tmp is None:
                 vote['percent'] = 0
+                vote['nb_votes'] = 0
             else:
                 vote['nb_votes'] = tmp['nb']
                 vote['percent'] = int((float(vote['nb_votes']) / float(vote['max_votes'])) * 100)
+        # :TODO:maethor:120606: Flash if user is concerned by the vote
         return render_template('vote.html', vote=vote, attachments=attachments, choices=choices, users=users.values(), can_vote=can_vote(idvote, get_userid()))
     flash(u'Vous n\'avez pas le droit de voir ce vote, désolé.')
     return redirect(url_for('home'))