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

general clean up of lazy dt/dd tag use, also added estimate remainging in the dd for run time, rather than elsewhere

Browse Source
This commit is contained in:
Damien De Paoli
2022-07-17 15:57:22 +10:00
parent d08d10a3ae
commit 3193b86f9f
1 changed files with 77 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
templates/joblog.html
View File

@@ -14,18 +14,14 @@ table.dataTable tbody td {
<h3>Show Job Details</h3>
<dl class="row">
<dt class="col-2">Name:</dt>
<dd class="col-4">{{job.name}}</dt>
<dd class="col-4">{{job.name}}</dd>
{% if job.wait_for != None %}
<dt class="col-2">Job #:</dt>
<dd class="col-4">{{job.id}} [Waiting on: <a href="{{url_for('joblog', id=job.wait_for)}}">Job (id={{job.wait_for}})</a>]</dd>
{% else %}
<dt class="col-2">Job #:</dt>
<dd class="col-4">{{job.id}}</dt>
<dd class="col-4">{{job.id}}</dd>
{% endif %}
{% if estimate != None %}
(estimated time remaining: {{estimate}})
{% endif %}
</dd>
<dt class="col-2">Current state:</dt>
{% if job.state == "Failed" %}
<dd class="col-4 bg-danger text-white">{{job.state}}</dd>
@@ -38,9 +34,12 @@ table.dataTable tbody td {
<dd class="col-4">{{job.start_time|vicdate}}</dt>
<dt class="col-2">Run Time:</dt>
<dd class="col-4">{{duration}}
{% if estimate != None %}
(remaining: {{estimate}})
{% endif %}
<dt class="col-2">Last Update:</dt>
<dd class="col-4">{{job.last_update|vicdate}}</dd>
<dt class="col-2">Files in pass:</label>
<dt class="col-2">Files in pass:</dt>
{% if job.num_files and job.num_files > 0 %}
<dd class="col-4">
{% set prog=(job.current_file_num/job.num_files*100)|round|int %}
@@ -92,7 +91,7 @@ table.dataTable tbody td {
]
} );
{% if refresh and job.pa_job_state != "Completed" %}
setTimeout(function(){ window.location.reload(1); }, 3000 )
setTimeout(function(){ window.location.reload(1); }, 10000 )
{% endif %}
} );
</script>