From 0fb98decd67ec695937480b4d5448adbcd508565 Mon Sep 17 00:00:00 2001 From: Guillaume Subiron Date: Tue, 29 May 2012 16:32:53 +0200 Subject: [PATCH] Votes list --- main.py | 12 +++++++----- templates/layout.html | 10 ++++++---- templates/show_user.html | 8 ++++---- templates/show_votes.html | 36 +++++++++++++++++++----------------- templates/user_settings.html | 10 +++++----- templates/vote.html | 2 +- 6 files changed, 42 insertions(+), 36 deletions(-) diff --git a/main.py b/main.py index 8c050b8..8a99adb 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) @@ -206,15 +206,17 @@ def del_role(idrole): @app.route('/votes/') def show_votes(votes): today = date.today() + active_button = votes + basequery = 'select *, roles.name as rolename from votes join roles on roles.id=votes.id_role' if votes == 'all': - votes = query_db('select * from votes order by id desc') + votes = query_db(basequery + ' order by id desc') elif votes == 'archive': - votes = query_db('select * from votes where date_end < (?) order by id desc', [today]) + votes = query_db(basequery + ' where date_end < (?) order by id desc', [today]) elif votes == 'current': - votes = query_db('select * from votes where date_end >= (?) order by id desc', [today]) + votes = query_db(basequery + ' where date_end >= (?) order by id desc', [today]) else: abort(404) - return render_template('show_votes.html', votes=votes) + return render_template('show_votes.html', votes=votes, active_button=active_button) #------ # Vote diff --git a/templates/layout.html b/templates/layout.html index 29f0045..66fd8e5 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -19,9 +19,9 @@
- Accueil - Votes en cours - Archives + Accueil + Votes en cours + Archives {% if session.user and session.user.is_admin %} Admin
    @@ -50,7 +50,7 @@
-

Outil de vote du CA FFDN

+

Outil de vote du CA FFDN {% block subtitle %}{% endblock %}

{% with messages = get_flashed_messages(with_categories="true") %} {% if messages %} {% for category, message in messages %} @@ -62,7 +62,9 @@ {% endif %} {% endwith %} +
{% block body %}{% endblock %} +
diff --git a/templates/show_user.html b/templates/show_user.html index 9ed3f60..3ce7513 100644 --- a/templates/show_user.html +++ b/templates/show_user.html @@ -1,16 +1,16 @@ {% extends "layout.html" %} {% block body %} -

{{ session.username }}

+

{{ session.user.name }}

Email : -
{{ session.email }} +
{{ session.user.email }}
Association : -
{{ session.organization }} +
{{ session.user.organization }}
Groupes :
à venir
- Modifier + Modifier
{% endblock %} diff --git a/templates/show_votes.html b/templates/show_votes.html index 5d7442e..90fd1f8 100644 --- a/templates/show_votes.html +++ b/templates/show_votes.html @@ -1,26 +1,28 @@ {% extends "layout.html" %} +{% block subtitle %} +Liste des votes +{% endblock %} {% block body %} -

Liste des votes

{% for vote in votes %}
-
-

{{ vote.title }}

-
-
-
+
+
+

{{ vote.title }}

+
+
+
+
+

Deadline : {{ vote.date_end }}

-
-
-
-
-
-

Documents

+

Groupe : {{ vote.rolename }}

+

Categorie : {{ vote.category }}

+
+
+

Notes

+

+ {{ vote.description|safe }} +

-
-

Notes

- {{ vote.description|safe }} -
{% else %}
Il n'y a pas encore de votes. Désolé.
diff --git a/templates/user_settings.html b/templates/user_settings.html index 85da44c..a4d497a 100644 --- a/templates/user_settings.html +++ b/templates/user_settings.html @@ -3,25 +3,25 @@

{{ session.username }}

-
+
Mise à jour du profil utilisateur
Attention : À l'issue de ce formulaire, vous devrez vous reconnecter
- +
- +
- +