X-Git-Url: http://git.cyclocoop.org/?p=cavote.git;a=blobdiff_plain;f=main.py;h=ccb7229ce6a47f90ad5db544a190f6cfb4dd3d4f;hp=14a839b9725432f4f3ecaace47f4a67ae104d2ee;hb=f2c5f4be15b6225e5e7d9f3c53084424beb32f1b;hpb=7ce620993c1f5b89f67affe7619b385d39abed17

diff --git a/main.py b/main.py
index 14a839b..ccb7229 100755
--- a/main.py
+++ b/main.py
@@ -530,9 +530,10 @@ def vote(idvote):
                                   order by random()')
                     g.db.execute('delete from user_choice_buffer_anonymous')
                     g.db.commit()
-                g.db.execute('insert into user_vote (id_user, id_vote) \
-                              values (?, ?)'
-                            , [session.get('user').get('id'), vote['id']])
+                comment = request.form.get('comment', None)
+                g.db.execute('insert into user_vote (id_user, id_vote, comment) \
+                              values (?, ?, ?)'
+                            , [session.get('user').get('id'), vote['id'], comment])
                 g.db.commit()
             else:
                 abort(401)
@@ -558,7 +559,7 @@ def vote(idvote):
         # ACTION: query users' choices joined with users' identity if not anonymous
         user_choices = query_db('select user_choice.id_user as userid, users.name as username, \
                                         choices.id as choiceid, choices.name as choice_name, \
-                                        user_choice.weight as weight \
+                                        user_choice.weight as weight, user_vote.comment as comment \
                                  from choices \
                                  join user_choice on choices.id = user_choice.id_choice \
                                  left join users on userid = users.id \
@@ -615,11 +616,12 @@ def vote(idvote):
         # ACTION: list user results per user
         users = OrderedDict()
         if vote['is_anonymous']:
-            user_votes = query_db('select users.name, id_user as userid \
+            user_votes = query_db('select users.name, id_user as userid, comment \
                                    from user_vote \
                                    join users on users.id = id_user where id_vote = ?', [idvote])
             for uc in user_votes:
                 users[uc['userid']] = { 'username':uc['name']
+                                      , 'comment':uc['comment']
                                       , 'choices':{}
                                       , 'userid':uc['userid'] }
         else:
@@ -633,6 +635,7 @@ def vote(idvote):
                 else:
                     users[uc['userid']] = { 'userid':uc['userid']
                                           , 'username':uc['username']
+                                          , 'comment':uc['comment']
                                           , 'choices':{uc['choiceid']:value} }
         attachments = query_db('select * from attachments where id_vote=?', [idvote])
         if query_db('select * from user_group where id_group = ? and id_user = ?'