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

fixed sort order to work with datatables sorting

Browse Source
This commit is contained in:
Damien De Paoli
2022-01-16 14:49:38 +11:00
parent d8db522d00
commit 28f15ee4e6
3 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
job.py
View File

@@ -139,14 +139,17 @@ def joblog(id):
else:
refresh=True
log_cnt = db.session.execute( f"select count(id) from joblog where job_id = {id}" ).first()[0]
newest_logs = Joblog.query.filter(Joblog.job_id==id).order_by(Joblog.log_date.desc() ).limit(NEWEST_LOG_LIMIT).all()
newest_logs = Joblog.query.filter(Joblog.job_id==id).order_by(Joblog.log_date.desc()).limit(NEWEST_LOG_LIMIT).all()
oldest_logs = Joblog.query.filter(Joblog.job_id==id).order_by(Joblog.log_date).limit(OLDEST_LOG_LIMIT).all()
logs=sorted( set( newest_logs + oldest_logs ), key=lambda el: el.log_date, reverse=True)
logs=sorted( set( oldest_logs + newest_logs ), key=lambda el: el.log_date )
if log_cnt > (NEWEST_LOG_LIMIT+OLDEST_LOG_LIMIT):
display_more=True
else:
display_more=False
order="desc"
print( f"order={order}" )
for l in logs:
print( f"log={l.log_date}" )
if joblog.pa_job_state == "Completed":
duration=(joblog.last_update-joblog.start_time)