From 4b6b889e208fe68520efa8d788638a12be7398c3 Mon Sep 17 00:00:00 2001 From: Francesco Siddi Date: Wed, 10 Sep 2014 16:52:09 +0200 Subject: [PATCH] Homepage exposing latest application info --- .../application/controllers/applications.py | 5 ++++- blender-bfct/application/controllers/main.py | 13 ++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/blender-bfct/application/controllers/applications.py b/blender-bfct/application/controllers/applications.py index 044c2e3..6e18cb8 100644 --- a/blender-bfct/application/controllers/applications.py +++ b/blender-bfct/application/controllers/applications.py @@ -1,4 +1,5 @@ import datetime +from dateutil.relativedelta import relativedelta from sqlalchemy import desc from application import db @@ -92,7 +93,9 @@ def final_review(approved, id): application.status = 'approved' else: application.status = 'rejected' - application.review_end_date = datetime.datetime.now() + review_end_date = datetime.datetime.now() + application.review_end_date = review_end_date + application.renewal_date = review_end_date + relativedelta(years=1) db.session.add(application) db.session.commit() diff --git a/blender-bfct/application/controllers/main.py b/blender-bfct/application/controllers/main.py index 1e68d17..7231116 100644 --- a/blender-bfct/application/controllers/main.py +++ b/blender-bfct/application/controllers/main.py @@ -13,7 +13,18 @@ from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound # Views @app.route('/') def homepage(): - return render_template('index.html', title='home') + if current_user.is_authenticated(): + applications = Application.query\ + .filter_by(blender_id=current_user.id)\ + .all() + + latest_application = None + for application in applications: + if application.status != 'rejected': + latest_application = application + break + + return render_template('index.html', application=latest_application, title='home') @app.route('/become-a-trainer/') def become_a_trainer():