diff --git a/drcr/statements/views.py b/drcr/statements/views.py index 6412afa..22e6448 100644 --- a/drcr/statements/views.py +++ b/drcr/statements/views.py @@ -25,11 +25,13 @@ from .models import StatementLine, StatementLineReconciliation @app.route('/statement-lines') def statement_lines(): if 'account' in request.args: - statement_lines = StatementLine.query.filter_by(source_account=request.args['account']).all() + statement_lines = db.select(StatementLine).where(StatementLine.source_account == request.args['account']).order_by(StatementLine.dt) else: - statement_lines = StatementLine.query.all() + statement_lines = db.select(StatementLine).order_by(StatementLine.dt) - return render_template('statements/statement_lines.html', statement_lines=sorted(statement_lines, key=lambda l: l.dt)) + page = db.paginate(statement_lines, per_page=request.args.get('per_page', 100)) + + return render_template('statements/statement_lines.html', page=page) @app.route('/statement-lines/charge', methods=['POST']) def statement_line_charge(): diff --git a/drcr/templates/statements/statement_lines.html b/drcr/templates/statements/statement_lines.html index 74fbd26..9d92d8f 100644 --- a/drcr/templates/statements/statement_lines.html +++ b/drcr/templates/statements/statement_lines.html @@ -22,9 +22,24 @@

Statement lines

-
+
{##} - Import statement + +
@@ -41,7 +56,7 @@ - {% for line in statement_lines %} + {% for line in page.items %}
{{ line.source_account }}