From 7ca0e369461945b70af96881d801d51db89c5853 Mon Sep 17 00:00:00 2001 From: Wout Schellaert Date: Sat, 10 Sep 2016 15:49:52 +0200 Subject: [PATCH] Small reformat --- app/app.py | 2 +- app/views/__init__.py | 28 ++++++++++++++-------------- app/views/stats.py | 7 +++++++ 3 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 app/views/stats.py diff --git a/app/app.py b/app/app.py index 2ea9aef..c4a37c5 100644 --- a/app/app.py +++ b/app/app.py @@ -44,4 +44,4 @@ if not app.debug: ) app.logger.addHandler( AirbrakeHandler(airbrake=airbrake) - ) + ) \ No newline at end of file diff --git a/app/views/__init__.py b/app/views/__init__.py index 2b7b2d1..01f9a67 100644 --- a/app/views/__init__.py +++ b/app/views/__init__.py @@ -1,20 +1,23 @@ -__author__ = 'feliciaan' - -from flask import url_for, render_template, abort, redirect, request, abort -from flask.ext.login import current_user, login_required from datetime import datetime, timedelta -from app import app, db -from models import Order, OrderItem, Location +from flask import url_for, render_template, abort +from flask.ext.login import login_required + +from app import app +from models import Order, Location # import views from views.order import get_orders +from views import stats + @app.route('/') def home(): prev_day = datetime.now() - timedelta(days=1) - recently_closed = get_orders(((Order.stoptime > prev_day) & (Order.stoptime < datetime.now()))) - return render_template('home.html', orders=get_orders(), recently_closed=recently_closed) + recently_closed = get_orders( + ((Order.stoptime > prev_day) & (Order.stoptime < datetime.now()))) + return render_template('home.html', orders=get_orders(), + recently_closed=recently_closed) @app.route('/location') @@ -25,20 +28,17 @@ def locations(): @app.route('/location/') def location(id): - loc = Location.query.filter(Location.id==id).first() + loc = Location.query.filter(Location.id == id).first() if loc is None: abort(404) return render_template('location.html', location=loc) + @app.route('/about/') def about(): - return render_template('about.html') + return render_template('about.html') -@app.route('/stats/') -def stats(): - return render_template('stats.html') - @app.route('/profile/') @login_required def profile(): diff --git a/app/views/stats.py b/app/views/stats.py new file mode 100644 index 0000000..f235d07 --- /dev/null +++ b/app/views/stats.py @@ -0,0 +1,7 @@ +from app import app +from flask import render_template + + +@app.route('/stats/') +def stats(): + return render_template('stats.html')