Archive / currentwq votes are separated

[cavote.git] / main.py

diff --git a/main.py b/main.py
index 57c876b..ea1179e 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -32,23 +32,9 @@ def teardown_request(exception):
 def home():
     return render_template('index.html')
 
-@app.route('/admin/votes')
-def show_votes():
-    cur = g.db.execute('select title, description, date from votes order by id desc')
-    votes = [dict(title=row[0], description=row[1], date=row[2]) for row in cur.fetchall()]
-    return render_template('show_votes.html', votes=votes)
 
-@app.route('/admin/vote/add', methods=['POST'])
-def add_vote():
-    if not session.get('logged_in'):
-        abort(401)
-    daten = date.today() + timedelta(days=60)
-    ndate = daten.strftime('%d %B %Y')
-    g.db.execute('insert into votes (title, description, date) values (?, ?, ?)',
-            [request.form['title'], request.form['description'], ndate])
-    g.db.commit()
-    flash('New entry was successfully posted')
-    return redirect(url_for('home'))
+#----------------
+# Login / Logout
 
 @app.route('/login', methods=['GET', 'POST'])
 def login():
@@ -61,6 +47,8 @@ def login():
         else:
             session['logged_in'] = True
             session['nickname'] = request.form['username']
+            if session['nickname'] == 'admin':
+                session['is_admin'] = True
             flash('You were logged in')
             return redirect(url_for('home'))
     return render_template('login.html', error=error)
@@ -71,9 +59,64 @@ def logout():
     flash('You were logged out')
     return redirect(url_for('home'))
 
+#---------------
+# User settings
+
+#------------
+# User admin
+
+
+#------------
+# Votes list
+
+@app.route('/votes/<votes>')
+def show_votes(votes):
+    today = date.today().strftime('%d %B %Y')
+    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})
+    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})
+    else:
+        abort(404)
+    votes = [dict(title=row[0], description=row[1], date_begin=row[2], date_end=row[3], 
+        pourcent=60) for row in cur.fetchall()]
+    return render_template('show_votes.html', votes=votes)
+
+#-------------
+# Votes admin
+
+@app.route('/votes/admin/new')
+def new_vote():
+    if not session.get('logged_in'):
+        abort(401)
+    return render_template('new_vote.html')
 
+@app.route('/votes/admin/add', methods=['POST'])
+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')
+    transparent = 0
+    public = 0
+    multiplechoice = 0
+    if 'transparent' in request.form.keys():
+        transparent = 1
+    if 'public' in request.form.keys():
+        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.commit()
+    flash('New entry was successfully posted')
+    return redirect(url_for('home'))
+
+#------
+# Main
 
 if __name__ == '__main__':
     app.run()
 
-