diff --git a/templates/joblog.html b/templates/joblog.html index f14a375..45a7627 100644 --- a/templates/joblog.html +++ b/templates/joblog.html @@ -3,43 +3,44 @@ {% block main_content %}

Show Job Details

-
-
Job #:
-
{{job.id}} +
Name:
-
{{job.name}} -
Start Time:
-
{{job.start_time|vicdate}} -
Duration:
-
{{duration}} +
{{job.name}} + {% if job.wait_for != None %} +
Job #:
+
{{job.id}} [Waiting on: Job (id={{job.wait_for}})]
+ {% else %} +
Job #:
+
{{job.id}} + {% endif %} {% if estimate != None %} (estimated time remaining: {{estimate}}) {% endif %}
-
Last Update:
-
{{job.last_update|vicdate}}
Current state:
{% if job.state == "Failed" %} -
{{job.state}}
+
{{job.state}}
{% elif job.state == "Withdrawn" %} -
{{job.state}}
+
{{job.state}}
{% else %} -
{{job.state}}
+
{{job.state}}
{% endif %} - {% if job.wait_for != None %} -
Waiting on Job:
-
Job (id={{job.wait_for}})
- {% endif %} -
Current File:
-
{{job.current_file}}
+
Start Time:
+
{{job.start_time|vicdate}} +
Run Time:
+
{{duration}} +
Last Update:
+
{{job.last_update|vicdate}}
Files in pass: {% if job.num_files and job.num_files > 0 %} -
+
{% set prog=(job.current_file_num/job.num_files*100)|round|int %}
{{job.current_file_num}} of {{job.num_files}} - {{prog}}%
+
Current File:
+
{{job.current_file}}
{% elif job.num_files == 0 and job.current_file_num > 0 %}
{{job.current_file_num}} of Unknown Total
{% else %} @@ -57,9 +58,9 @@ {{log.log_date|vicdate}}{{log.log|safe}} {% if display_more and loop.index == NEWEST_LOG_LIMIT %} - Remaining logs truncated + Remaining logs hidden - + {% endif %}