X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=main.py;h=2ab60f8ef8d201050e36a9d8f48836b775b75bf8;hb=a2d3a797375c6e14889d89b975ee32e3068926b6;hp=c26c2cb171165085ec3fcfed02db7efb5ab86073;hpb=f42b7613c22add2650031ac5fa04065d82393436;p=cavote.git

diff --git a/main.py b/main.py
index c26c2cb..2ab60f8 100755
--- a/main.py
+++ b/main.py
@@ -29,7 +29,7 @@ def teardown_request(exception):
 
 @app.route('/')
 def home():
-    return render_template('index.html')
+    return render_template('index.html', active_button="home")
 
 def query_db(query, args=(), one=False):
     cur = g.db.execute(query, args)
@@ -50,7 +50,7 @@ def valid_login(username, password):
     return query_db('select * from users where email = ? and password = ?', [username, password], one=True)
 
 def connect_user(user):
-    session['user'] = user # :KLUDGE:maethor:120528: Stoquer toute la ligne de la table users dans la session, c'est un peu crade…
+    session['user'] = user # :KLUDGE:maethor:120528: Stoquer toute la ligne de la table users dans la session, c'est un peu crade
     #session['user']['id'] = user['id']
     #session['user']['name'] = user['name']
     #session['user']['email'] = user['email']
@@ -90,7 +90,7 @@ def password_lost():
         if user is None:
             flash('Cet utilisateur n\'existe pas !', 'error')
         else:
-            # :TODO:maethor:120528: Générer la clé, la mettre dans la base de données et envoyer le mail
+            # :TODO:maethor:120528: Generer la cle, la mettre dans la base de données et envoyer le mail
             flash(u"Un mail a été envoyé à " + user['email'], 'info')
     return render_template('password_lost.html')
 
@@ -109,13 +109,13 @@ def login_key(userid, key):
 # User settings
 
 @app.route('/user/<userid>')
-def show_user(userid):
+def user(userid):
     if int(userid) != session.get('user').get('id'):
         abort(401)
-    return render_template('show_user.html')
+    return render_template('user.html')
 
 @app.route('/user/settings/<userid>', methods=['GET', 'POST'])
-def user_settings(userid):
+def user_edit(userid):
     if int(userid) != session.get('user').get('id'):
         abort(401)
     if request.method == 'POST':
@@ -125,7 +125,7 @@ def user_settings(userid):
         disconnect_user() # :TODO:maethor:120528: Maybe useless, but this is simple way to refresh session :D
         flash(u'Votre profil a été mis à jour !', 'success')
         return redirect(url_for('login'))
-    return render_template('user_settings.html')
+    return render_template('user_edit.html')
 
 @app.route('/user/password/<userid>', methods=['GET', 'POST'])
 def user_password(userid):
@@ -139,13 +139,21 @@ def user_password(userid):
             flash(u'Votre mot de passe a été mis à jour.', 'success')
         else:
             flash(u'Les mots de passe sont différents.', 'error')
-    return render_template('user_settings.html')
+    return render_template('user_edit.html')
 
 #------------
 # User admin
 
-@app.route('/users/admin/add', methods=['GET', 'POST'])
-def add_user():
+@app.route('/admin/users')
+def admin_users():
+    if not session.get('user').get('is_admin'):
+        abort(401)
+    users = query_db('select *, roles.name as rolename from (select *, name as username from users join user_role on id=id_user order by id desc) join roles on id_role=roles.id')
+    # :TODO:maethor:20120530: Find a way to reduce the dict
+    return render_template('admin_users.html', users=users)
+
+@app.route('/admin/users/add', methods=['GET', 'POST'])
+def admin_user_add():
     if not session.get('user').get('is_admin'):
         abort(401)
     if request.method == 'POST':
@@ -158,34 +166,116 @@ def add_user():
             g.db.execute('insert into users (email, name, organization, password, is_admin) values (?, ?, ?, ?, ?)',
                     [request.form['email'], request.form['username'], request.form['organization'], password, admin])
             g.db.commit()
-            # :TODO:maethor:120528: Send mail
-            flash(u'Le nouvel utilisateur a été créé avec succès', 'success')
-            return redirect(url_for('home'))
+            user = query_db('select * from users where email = ?', [request.form["email"]], one=True)
+            if user:
+              for role in request.form.getlist('roles'):
+                  # :TODO:maethor:120528: Check if this role exist
+                  if query_db('select id from roles where id = ?', role, one=True) is None:
+                      abort(401)
+                  g.db.execute('insert into user_role values (?, ?)', [user['id'], role])
+                  g.db.commit()
+              # :TODO:maethor:120528: Send mail
+              flash(u'Le nouvel utilisateur a été créé avec succès', 'success')
+              return redirect(url_for('admin_users'))
+            else:
+                flash(u'Une erreur s\'est produite.', 'error')
         else:
             flash(u"Vous devez spécifier une adresse email.", 'error')
-    return render_template('add_user.html')
+    groups = query_db('select * from roles where system=0') 
+    return render_template('admin_user_new.html', groups=groups)
+
+#-------------
+# Roles admin
+
+@app.route('/admin/roles')
+def admin_roles():
+    if not session.get('user').get('is_admin'):
+        abort(401)
+    roles = query_db('select * from roles')
+    return render_template('admin_roles.html', roles=roles)
+
+@app.route('/admin/roles/add', methods=['POST'])
+def admin_role_add():
+    if not session.get('user').get('is_admin'):
+        abort(401)
+    if request.method == 'POST':
+        if request.form['name']:
+            g.db.execute('insert into roles (name) values (?)', [request.form['name']])
+            g.db.commit()
+        else:
+            flash(u"Vous devez spécifier un nom.", "error")
+    return redirect(url_for('admin_roles'))
+
+@app.route('/admin/roles/delete/<idrole>')
+def admin_role_del(idrole):
+    if not session.get('user').get('is_admin'):
+        abort(401)
+    role = query_db('select * from roles where id = ?', [idrole], one=True)
+    if role is None:
+        abort(404)
+    if role['system']:
+        abort(401)
+    g.db.execute('delete from roles where id = ?', [idrole])
+    g.db.commit()
+    return redirect(url_for('admin_roles'))
 
 #------------
 # Votes list
 
 @app.route('/votes/<votes>')
-def show_votes(votes):
+def votes(votes):
     today = date.today()
+    active_button = votes
+    basequery = 'select *, roles.name as rolename from votes join roles on roles.id=votes.id_role where is_open=1'
     if votes == 'all':
-        votes = query_db('select title, description, date_begin, date_end from votes order by id desc')
+        votes = query_db(basequery + ' order by id desc')
     elif votes == 'archive':
-        votes = query_db('select title, description, date_begin, date_end from votes where date_end < (?) order by id desc', [today])
+        votes = query_db(basequery + ' and date_end < (?) order by id desc', [today])
     elif votes == 'current':
-        votes = query_db('select title, description, date_begin, date_end from votes where date_end >= (?) order by id desc', [today])
+        votes = query_db(basequery + ' and date_end >= (?) order by id desc', [today])
     else:
         abort(404)
-    return render_template('show_votes.html', votes=votes)
+    return render_template('votes.html', votes=votes, active_button=active_button)
+
+#------
+# Vote
+
+def can_see_vote(idvote, iduser=-1):
+    user = query_db('select * from users where id=?', [iduser], one=True)
+    vote = query_db('select * from votes where id=?', [idvote], one=True)
+    if user is None and not vote.is_public:
+        return False
+    return True # :TODO:maethor:20120529: Check others things
+
+def can_vote(idvote, iduser=-1):
+    if not can_see_vote(idvote, iduser):
+        return False
+    return True # :TODO:maethor:20120529: Check others things
+
+@app.route('/vote/<idvote>')
+def vote(idvote):
+    vote = query_db('select *, roles.name as rolename from votes join roles on roles.id=votes.id_role where votes.id=?', [idvote], one=True)
+    if vote is None:
+        abort(404)
+    if can_see_vote(idvote, session.get('user').get('id')):
+        choices = query_db('select * from choices where id_vote=?', [idvote])
+        attachments = query_db('select * from attachments where id_vote=?', [idvote])
+        return render_template('vote.html', vote=vote, attachments=attachments, choices=choices, can_vote=can_vote(idvote, session.get('user').get('id')))
+    flash('Vous n\'avez pas le droit de voir ce vote, désolé.')
+    return(url_for('home'))
 
 #-------------
 # Votes admin
 
-@app.route('/votes/admin/add', methods=['GET', 'POST'])
-def add_vote():
+@app.route('/admin/votes/list')
+def admin_votes():
+    if not session.get('user').get('is_admin'):
+        abort(401)
+    votes = query_db('select *, roles.name as rolename from votes join roles on roles.id=votes.id_role order by id desc')
+    return render_template('admin_votes.html', votes=votes)
+
+@app.route('/admin/votes/add', methods=['GET', 'POST'])
+def admin_vote_add():
     if not session.get('user').get('is_admin'):
         abort(401)
     if request.method == 'POST':
@@ -201,8 +291,11 @@ def add_vote():
                 public = 1
             if 'multiplechoice' in request.form.keys():
                 multiplechoice = 1
-            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])
+            role = query_db('select id from roles where name = ?', [request.form['role']], one=True)
+            if role is None:
+                role[id] = 1
+            g.db.execute('insert into votes (title, description, category, date_begin, date_end, is_transparent, is_public, is_multiplechoice, id_role, id_author) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+                    [request.form['title'], request.form['description'], request.form['category'], date_begin, date_end, transparent, public, multiplechoice, role['id'], session['user']['id']])
             g.db.commit()
             vote = query_db('select * from votes where title = ? and date_begin = ? order by id desc', 
                     [request.form['title'], date_begin], one=True) # :DEBUG:maethor:20120528: Bug possible car le titre n'est pas unique
@@ -211,25 +304,47 @@ def add_vote():
                 return redirect(url_for('home'))
             else:
                 flash(u"Le vote a été créé", 'info')
-                return redirect(url_for('edit_vote', voteid=vote['id']))
+                return redirect(url_for('admin_vote_edit', voteid=vote['id']))
         else:
             flash(u'Vous devez spécifier un titre.', 'error')
-    return render_template('new_vote.html')
+    groups = query_db('select * from roles') 
+    return render_template('admin_vote_new.html', groups=groups)
 
-@app.route('/votes/admin/edit/<voteid>', methods=['GET', 'POST'])
-def edit_vote(voteid):
+@app.route('/admin/votes/edit/<voteid>', methods=['GET', 'POST'])
+def admin_vote_edit(voteid):
     if not session.get('user').get('is_admin'):
         abort(401)
     vote = query_db('select * from votes where id = ?', [voteid], one=True)
     if vote is None:
         abort(404)
-    #if request.method == 'POST':
-    # :TODO:maethor:20120528
+    if request.method == 'POST':
+        if request.form['title']:
+            # :TODO:maethor:120529: Calculer date_begin pour pouvoir y ajouter duration et obtenir date_end
+            transparent = 0
+            public = 0
+            if 'transparent' in request.form.keys():
+                transparent = 1
+            if 'public' in request.form.keys():
+                public = 1
+            isopen = 0
+            if request.form['status'] == 'Ouvert': # :TODO:maethor:20120529: Check if there is at least 2 choices before
+                isopen = 1
+            g.db.execute('update votes set title = ?, description = ?, category = ?, is_transparent = ?, is_public = ?, is_open = ? where id = ?',
+                    [request.form['title'], request.form['description'], request.form['category'], transparent, public, isopen, 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:20120529: Calculer la durée du vote (différence date_end - date_begin) 
+    vote['duration'] = 15
+    group = query_db('select name from roles where id = ?', [vote['id_role']], one=True) 
     choices = query_db('select * from choices where id_vote = ?', [voteid])
-    return render_template('edit_vote.html', vote=vote, choices=choices)
+    return render_template('admin_vote_edit.html', vote=vote, group=group, choices=choices)
 
-@app.route('/votes/admin/addchoice/<voteid>', methods=['POST'])
-def add_choice(voteid):
+@app.route('/admin/votes/addchoice/<voteid>', methods=['POST'])
+def admin_vote_addchoice(voteid):
     if not session.get('user').get('is_admin'):
         abort(401)
     vote = query_db('select * from votes where id = ?', [voteid], one=True)
@@ -237,10 +352,10 @@ def add_choice(voteid):
         abort(404)
     g.db.execute('insert into choices (name, id_vote) values (?, ?)', [request.form['title'], voteid])
     g.db.commit()
-    return redirect(url_for('edit_vote', voteid=voteid))
+    return redirect(url_for('admin_vote_edit', voteid=voteid))
 
-@app.route('/votes/admin/editchoice/<voteid>/<choiceid>', methods=['POST', 'DELETE'])
-def edit_choice(voteid, choiceid):
+@app.route('/admin/votes/editchoice/<voteid>/<choiceid>', methods=['POST', 'DELETE'])
+def admin_vote_editchoice(voteid, choiceid):
     if not session.get('user').get('is_admin'):
         abort(401)
     choice = query_db('select * from choices where id = ? and id_vote = ?', [choiceid, voteid], one=True)
@@ -252,10 +367,10 @@ def edit_choice(voteid, choiceid):
     elif request.method == 'DELETE': # :COMMENT:maethor:20120528: I can't find how to use it from template
         g.db.execute('delete from choices where id = ? and id_vote = ?', [choiceid, voteid])
         g.db.commt()
-    return redirect(url_for('edit_vote', voteid=voteid))
+    return redirect(url_for('admin_vote_edit', voteid=voteid))
 
-@app.route('/votes/admin/deletechoice/<voteid>/<choiceid>')
-def delete_choice(voteid, choiceid):
+@app.route('/admin/votes/deletechoice/<voteid>/<choiceid>')
+def admin_vote_deletechoice(voteid, choiceid):
     if not session.get('user').get('is_admin'):
         abort(401)
     choice = query_db('select * from choices where id = ? and id_vote = ?', [choiceid, voteid], one=True)
@@ -263,7 +378,7 @@ def delete_choice(voteid, choiceid):
         abort(404)
     g.db.execute('delete from choices where id = ? and id_vote = ?', [choiceid, voteid])
     g.db.commit()
-    return redirect(url_for('edit_vote', voteid=voteid))
+    return redirect(url_for('admin_vote_edit', voteid=voteid))
 
 #------
 # Main