ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keep last form values and fix month -> Month in oldest / if

Browse Source
This commit is contained in:
Damien De Paoli
2021-01-31 18:16:55 +11:00
parent da93c80d4a
commit 4fe74c02bb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
files.py
View File

@@ -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)