From 10e7bb1b361c544099c610103f115d11b5a61889 Mon Sep 17 00:00:00 2001 From: Guillaume Subiron Date: Mon, 28 May 2012 15:23:30 +0200 Subject: [PATCH] Debug archives/current --- main.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/main.py b/main.py index ea1179e..d6f01db 100755 --- a/main.py +++ b/main.py @@ -71,13 +71,13 @@ def logout(): @app.route('/votes/') def show_votes(votes): - today = date.today().strftime('%d %B %Y') + today = date.today() if votes == 'all': cur = g.db.execute('select title, description, date_begin, date_end from votes order by id desc') elif votes == 'archives': - cur = g.db.execute('select title, description, date_begin, date_end from votes where date_end < :today order by id desc', {"today" : today}) + cur = g.db.execute('select title, description, date_begin, date_end from votes where date_end < (?) order by id desc', [today]) elif votes == 'currently': - cur = g.db.execute('select title, description, date_begin, date_end from votes where date_end > :today order by id desc', {"today" : today}) + cur = g.db.execute('select title, description, date_begin, date_end from votes where date_end >= (?) order by id desc', [today]) else: abort(404) votes = [dict(title=row[0], description=row[1], date_begin=row[2], date_end=row[3], @@ -97,8 +97,8 @@ def new_vote(): def add_vote(): if not session.get('logged_in'): abort(401) - daten = date.today() + timedelta(days=int(request.form['days'])) - ndate = daten.strftime('%d %B %Y') + date_begin = date.today() + date_end = date.today() + timedelta(days=int(request.form['days'])) transparent = 0 public = 0 multiplechoice = 0 @@ -108,8 +108,8 @@ def add_vote(): public = 1 if 'multiplechoice' in request.form.keys(): multiplechoice = 1 - g.db.execute('insert into votes (title, description, date_end, is_transparent, is_public, is_multiplechoice) values (?, ?, ?, ?, ?, ?)', - [request.form['title'], request.form['description'], ndate, transparent, public, multiplechoice]) + g.db.execute('insert into votes (title, description, date_begin, date_end, is_transparent, is_public, is_multiplechoice) values (?, ?, ?, ?, ?, ?, ?)', + [request.form['title'], request.form['description'], date_begin, date_end, transparent, public, multiplechoice]) g.db.commit() flash('New entry was successfully posted') return redirect(url_for('home')) -- 2.20.1