diff --git a/job.py b/job.py index d441ec4..ffbb775 100644 --- a/job.py +++ b/job.py @@ -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) diff --git a/main.py b/main.py index 34c0482..43df9a2 100644 --- a/main.py +++ b/main.py @@ -10,7 +10,7 @@ import os import re import socket from status import st, Status -from shared import CreateSelect, CreateFoldersSelect, LocationIcon, DB_URL, PROD_HOST, NEWEST_LOG_LIMIT +from shared import CreateSelect, CreateFoldersSelect, LocationIcon, DB_URL, PROD_HOST, OLDEST_LOG_LIMIT # for ldap auth from flask_ldap3_login import LDAP3LoginManager @@ -72,7 +72,7 @@ app.jinja_env.globals['ClearJM_Message'] = ClearJM_Message app.jinja_env.globals['CreateSelect'] = CreateSelect app.jinja_env.globals['CreateFoldersSelect'] = CreateFoldersSelect app.jinja_env.globals['LocationIcon'] = LocationIcon -app.jinja_env.globals['NEWEST_LOG_LIMIT'] = NEWEST_LOG_LIMIT +app.jinja_env.globals['OLDEST_LOG_LIMIT'] = OLDEST_LOG_LIMIT app.jinja_env.globals['current_user'] = current_user diff --git a/templates/joblog.html b/templates/joblog.html index 9bd0f4a..2b490b7 100644 --- a/templates/joblog.html +++ b/templates/joblog.html @@ -1,6 +1,15 @@ {% extends "base.html" %} {% block main_content %} + + + +

Show Job Details

@@ -48,16 +57,16 @@ {% endif %}
+{{order}} - - +
When - - Details
+ {% for log in logs %} - - {% if display_more and loop.index == NEWEST_LOG_LIMIT %} + + {% if display_more and loop.index == OLDEST_LOG_LIMIT %} +
#WhenDetails
{{log.log_date|vicdate}}{{log.log|safe}}
{{loop.index}}{{log.log_date|vicdate}}{{log.log|safe}}
{{loop.index}}.1 Remaining logs hidden @@ -71,8 +80,23 @@ {% endblock main_content %} {% block script_content %} {% endblock script_content %}