From 4fe74c02bb1219f5182a497beb50fa9c83f4a489 Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Sun, 31 Jan 2021 18:16:55 +1100 Subject: [PATCH] keep last form values and fix month -> Month in oldest / if --- files.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/files.py b/files.py index 13dd3e3..8db2878 100644 --- a/files.py +++ b/files.py @@ -117,9 +117,10 @@ def files(): year=File.query.order_by(File.year).first() month=File.query.filter(File.year==year.year).order_by(File.month).first() woy=File.query.filter(File.year==year.year).order_by(File.woy).first() + print( f"y={year}, m={month}, woy={woy}") if which == "Week": entries=Entry.query.join(File).filter(File.year==year.year).filter(File.woy==woy.woy).order_by(Entry.name).all() - elif which == "month": + elif which == "Month": entries=Entry.query.join(File).filter(File.year==year.year).filter(File.month==month.month).order_by(Entry.name).all() elif which == "Year": entries=Entry.query.join(File).filter(File.year==year.year).order_by(Entry.name).all() @@ -133,7 +134,7 @@ def files(): entries=Entry.query.join(File).filter(File.year==year.year).filter(File.month==month.month).order_by(Entry.name).all() elif which == "Year": entries=Entry.query.join(File).filter(File.year==year.year).order_by(Entry.name).all() - return render_template("files.html", page_title='View Files', entry_data=entries, grouping=grouping, which=which ) + return render_template("files.html", page_title='View Files', entry_data=entries, grouping=grouping, which=which, form=request.form ) ################################################################################ # /search -> show thumbnail view of files from import_path(s)