X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=main.py;h=da9316bbf7c53a9024aea144e33ac6b432808681;hb=af86f1aa2f19d4ebb51217983eb6935befe595ed;hp=25d31ebc8719e675fd4fc2ccb39485cdf09a96fe;hpb=4e9202556728e048a72e29d07712786447ae9795;p=cavote.git diff --git a/main.py b/main.py index 25d31eb..da9316b 100755 --- a/main.py +++ b/main.py @@ -4,7 +4,7 @@ from flask import Flask, request, session, g, redirect, url_for, abort, \ render_template, flash import sqlite3 -from datetime import date, time, timedelta +from datetime import date, time, timedelta, datetime import time from contextlib import closing import locale @@ -19,8 +19,7 @@ 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" # :TODO:maethor:120605: Find a cleaner way to do this -VERSION = "cavote 0.0.1" +VERSION = "cavote 0.1.0" SMTP_SERVER = "10.33.33.30" 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']} @@ -93,6 +92,8 @@ def login(): else: connect_user(user) flash(u'Vous êtes connecté. Bienvenue, %s !' % user['name'], 'success') + if request.args.get('continue'): + return redirect(request.args['continue']) return redirect(url_for('home')) return render_template('login.html') @@ -100,6 +101,8 @@ def login(): def logout(): disconnect_user() flash(u'Vous avez été déconnecté.', 'info') + if request.args.get('continue') and not "admin" in request.args.get('continue'): + return redirect(request.args['continue']) return redirect(url_for('home')) #----------------- @@ -116,12 +119,12 @@ def password_lost(): key = keygen() g.db.execute('update users set key = ? where id = ?', [key, user['id']]) g.db.commit() - link = BASEURL + url_for('login_key', userid=user['id'], key=key) + link = request.url_root + url_for('login_key', userid=user['id'], key=key) BODY = string.join(( "From: %s" % EMAIL, "To: %s" % user['email'], "Subject: [Cavote] Password lost", - "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()), + "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()).decode('utf-8'), "X-Mailer: %s" % VERSION, "", "You have lost your password.", @@ -246,12 +249,12 @@ def admin_user_add(): else: g.db.execute('insert into user_group values (?, ?)', [user['id'], group]) g.db.commit() - link = BASEURL + url_for('login_key', userid=user['id'], key=user['key']) + link = request.url_root + url_for('login_key', userid=user['id'], key=user['key']) BODY = string.join(( "From: %s" % EMAIL, "To: %s" % user['email'], "Subject: [Cavote] Welcome", - "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()), + "Date: %s" % time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()).decode('utf-8'), "X-Mailer: %s" % VERSION, "", "Hi %s!" % user['name'], @@ -380,11 +383,11 @@ def votes(votes): 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' if votes == 'all': - votes = query_db(basequery + ' order by id desc') + votes = query_db(basequery + ' order by date_end') elif votes == 'archive': - votes = query_db(basequery + ' and is_terminated=1 order by id desc') + votes = query_db(basequery + ' and is_terminated=1 order by date_end desc') elif votes == 'current': - votes = query_db(basequery + ' and is_terminated=0 order by id desc') + votes = query_db(basequery + ' and is_terminated=0 order by date_end') elif votes == 'waiting': basequery = 'select votes.* from user_group join (' + basequery + ') as votes on votes.id_group = user_group.id_group where user_group.id_user = ?' already_voted = 'select id_vote from user_choice join choices on user_choice.id_choice = choices.id where id_user = ?' @@ -429,7 +432,7 @@ def has_voted(idvote, iduser=-1): @app.route('/vote/', methods=['GET', 'POST']) def vote(idvote): - vote = query_db('select votes.*, groups.name as groupname from votes join groups on groups.id=votes.id_group where votes.id=?', [idvote], one=True) + vote = query_db('select votes.*, groups.name as groupname, users.name as author from votes join groups on groups.id=votes.id_group join users on users.id = id_author where votes.id=?', [idvote], one=True) if vote is None: abort(404) if can_see_vote(idvote, get_userid()): @@ -473,7 +476,8 @@ def vote(idvote): 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 + if query_db('select * from user_group where id_group = ? and id_user = ?', [vote['id_group'], get_userid()], one=True) and not vote['is_terminated']: + flash(u'Ce vote vous concerne !', 'info') 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')) @@ -495,7 +499,7 @@ def admin_votes(): if not session.get('user').get('is_admin'): abort(401) votes = query_db('select *, votes.id as voteid, groups.name as groupname from votes join groups on groups.id=votes.id_group order by id desc') - return render_template('admin_votes.html', votes=votes) + return render_template('admin_votes.html', votes=votes, today=date.today().strftime("%Y-%m-%d")) @app.route('/admin/votes/add', methods=['GET', 'POST']) def admin_vote_add(): @@ -550,7 +554,9 @@ def admin_vote_edit(voteid): abort(404) if request.method == 'POST': if request.form['title']: - # :TODO:maethor:120529: Calculer date_begin pour pouvoir y ajouter duration et obtenir date_end + if request.form['days'] > 0: + date_end = datetime.strptime(vote['date_begin'], "%Y-%m-%d") + timedelta(days=int(request.form['days'])) + date_end = date_end.strftime("%Y-%m-%d") transparent = 0 public = 0 if 'transparent' in request.form.keys(): @@ -569,19 +575,20 @@ def admin_vote_edit(voteid): isterminated = 1 if vote['is_open']: isopen = 1 - g.db.execute('update votes set title = ?, description = ?, category = ?, is_transparent = ?, is_public = ?, is_open = ?, is_terminated = ? where id = ?', - [request.form['title'], request.form['description'], request.form['category'], transparent, public, isopen, isterminated, voteid]) + g.db.execute('update votes set title = ?, description = ?, category = ?, is_transparent = ?, is_public = ?, is_open = ?, is_terminated = ?, date_end = ? where id = ?', + [request.form['title'], request.form['description'], request.form['category'], transparent, public, isopen, isterminated, date_end, voteid]) g.db.commit() vote = query_db('select * from votes where id = ?', [voteid], one=True) flash(u"Le vote a bien été mis à jour.", "success") else: flash(u'Vous devez spécifier un titre.', 'error') - - # :TODO:maethor:120529: Calculer la durée du vote (différence date_end - date_begin) - vote['duration'] = 15 + vote['duration'] = (datetime.strptime(vote['date_end'], "%Y-%m-%d") + - datetime.strptime(vote['date_begin'], "%Y-%m-%d")).days group = query_db('select name from groups where id = ?', [vote['id_group']], one=True) choices = query_db('select * from choices where id_vote = ?', [voteid]) attachments = query_db('select * from attachments where id_vote = ?', [voteid]) + if date.today().strftime("%Y-%m-%d") > vote['date_end']: + 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, choices=choices, attachments=attachments) @app.route('/admin/votes/addchoice/', methods=['POST'])