g.db.execute('delete from user_group where id_user = ? and id_group = ?', [iduser, group['id']])
g.db.commit()
for group in groups:
- group = query_db('select id from groups where id = ?', group, one=True)
+ group = query_db('select id from groups where id = ?', [group], one=True)
if group is None:
flash(u'Le groupe portant l\'id %s n\'existe pas.' % group, 'warning')
else:
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 and is_hidden=0'
+ where is_hidden=0'
if votes == 'all':
- votes = query_db(basequery + ' order by date_end')
+ votes = query_db(basequery + ' and is_open=1 order by date_end')
elif votes == 'archive':
votes = query_db(basequery + ' and is_terminated=1 order by date_end desc')
elif votes == 'current':
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)
group by id_group', [vote['id_group']], one=True)
if max_votes is None:
vote['percent'] = 0
+ vote['nb_votes'] = 0
else:
vote['max_votes'] = max_votes['nb']
votes = query_db('select id_vote, count(*) as nb \
# 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 \
# 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:
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 = ?'
votes = query_db('select *, votes.id as voteid, groups.name as groupname from votes \
join groups on groups.id=votes.id_group \
where is_hidden=0 order by id desc')
- return render_template('admin_votes.html', votes=votes, today=date.today().strftime("%Y-%m-%d"))
+ return render_template('admin_votes.html', votes=votes
+ , today=date.today().strftime("%Y-%m-%d")
+ , can_delete_votes=CAN_DELETE_VOTES
+ )
@app.route('/admin/votes/add', methods=['GET', 'POST'])
def admin_vote_add():
cardinal_values = cardinals[cardinal]['values']
weight = cardinals[cardinal]['first'] if not cardinals[cardinal]['first'] is None else -(cardinal/2)
if query_db('select * from cardinals where id = ?', [cardinal], one=True) is None:
- g.db.execute('insert into cardinals (id, name) values (?, ?)', [len(cardinal_values), cardinal_name])
+ g.db.execute('insert into cardinals (id, name, first) values (?, ?, ?)', [len(cardinal_values), cardinal_name, weight])
g.db.commit()
for name in cardinal_values:
g.db.execute('insert into values_ (id_cardinal, name, weight) values (?, ?, ?)'
vote = query_db('select * from votes where id = ?', [voteid], one=True)
if vote is None:
abort(404)
+ print "\nvote: %s\n" % str(vote)
if request.method == 'POST':
if request.form['title']:
if request.form['days'] > 0:
choices = query_db('select * from choices where id_vote = ?', [voteid])
values_ = query_db('select * from cardinals where id = ?', [vote['id_cardinal']], one=True)['name']
attachments = query_db('select * from attachments where id_vote = ?', [voteid])
- if date.today().strftime("%Y-%m-%d") > vote['date_end']:
+ if date.today().strftime("%Y-%m-%d") > vote['date_end'] and not vote['is_terminated']:
flash(u'La deadline du vote est expirée, vous devriez terminer le vote.')
return render_template('admin_vote_edit.html', vote=vote, group=group, values_=values_, choices=choices, attachments=attachments, quorums=QUORUMS)
def admin_vote_del(idvote):
if not session.get('user').get('is_admin'):
abort(401)
- vote = query_db('select * from votes where id = ?', [idvote], one=True)
- if vote is None:
- abort(404)
- g.db.execute('update votes set is_hidden=1 where id = ?', [idvote])
- g.db.commit()
+ if not CAN_DELETE_VOTES:
+ flash(u'La configuration interdit la suppression des votes.', 'error')
+ else:
+ if vote is None:
+ abort(404)
+ g.db.execute('update votes set is_hidden=1 where id = ?', [idvote])
+ g.db.commit()
return redirect(url_for('admin_votes'))
@app.route('/admin/votes/addchoice/<voteid>', methods=['POST'])
dépôts / cavote.git / blobdiff