use file progress as overall process in job list if applicable

This commit is contained in:
2021-01-20 16:35:58 +11:00
parent 41c2af2cd2
commit 6523500d54

View File

@@ -7,21 +7,28 @@
var completed_rows=Array()
{% for job in jobs %}
row='<tr><td><a href="{{url_for('joblog', id=job.id)}}">{{job.name}}</a>'
row='<tr><td><a href="{{url_for('joblog', id=job.id)}}">Job #{{job.id}} - {{job.name}}</a>'
{% for ex in job.extra %}
row+=' ({{ex.name}} == {{ ex.value }})'
{% endfor %}
row+= '</td><td>{{job.start_time}}</td><td>'
{% if job.pa_job_state != "Completed" %}
row +=`
In Progress (no details yet)
</td></tr>
`
{% if job.num_files and job.num_files > 0 %}
{% set prog=(job.current_file_num/job.num_files*100)|round|int %}
row +=`
<div class="progress" style="line-height:2">
<div class="progress-bar bg-info" role="progressbar" style="width: {{prog}}%;" aria-valuenow="{{prog}}" aria-valuemin="0" aria-valuemax="100">
{{job.current_file_num}} of {{job.num_files}} - {{prog}}%
</div>
</div>
</td></tr>
`
{% else %}
row += 'In Progress</td></tr>'
{% endif %}
active_rows.push(row)
{% else %}
row +=`
{{job.last_update}}</td></td></tr>
`
row += '{{job.last_update}}</td></td></tr>'
completed_rows.push(row)
{% endif %}
{% endfor %}
@@ -30,7 +37,7 @@
<h3>{{page_title}}</h3>
<table id="job_tbl" class="table table-striped table-sm" data-toolbar="#toolbar" data-search="true">
<thead>
<tr class="thead-light"><th>Active Jobs</th><th>Job Started</th><th>Passes</th></tr>
<tr class="thead-light"><th>Active Jobs</th><th>Job Started</th><th>Progress</th></tr>
</thead>
<tbody>
<script>