coolneng/igdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move query logic to new module

Browse Source
This commit is contained in:
coolneng
2020-01-09 21:10:27 +01:00
parent c6e63cf087
commit 65d3af6817
3 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/app/routes.py
View File

@@ -5,6 +5,7 @@ from flask import flash, redirect, render_template, url_for, request
from flask_login import current_user, login_user, logout_user, login_required
from werkzeug.urls import url_parse
from processing.tabulate import create_table
from database.queries import query_annual_data, query_user
@app.route("/")
@@ -19,7 +20,7 @@ def login():
return redirect(url_for("admin"))
form = LoginForm()
if form.validate_on_submit():
user = User.query.filter_by(username=form.username.data).first()
user = query_user(form)
if user is None or not user.check_password(form.password.data):
flash("Invalid username or password")
return redirect(url_for("login"))
@@ -58,19 +59,10 @@ def data():
def table_selection():
form = YearForm()
if form.validate_on_submit():
annual_data = db.session.query(Annual_Data).filter_by(year=form.year.data)
query = annual_data
if form.name.data:
query = (
db.session.query(Annual_Data)
.filter_by(year=form.year.data)
.join(Glacier, Glacier.id == Annual_Data.id)
.filter_by(name=form.name.data)
.group_by(Glacier.id)
)
if query.scalar() is None:
flash("Sorry, no results found")
return redirect(url_for("table_selection"))
query = query_annual_data(form)
if query.scalar() is None:
flash("Sorry, no results found")
return redirect(url_for("table_selection"))
table = create_table(query.statement)
return render_template("table.html", table=table, title="Table")
return render_template("table_selection.html", title="Data", form=form)