allow job log to have links embedded, and label num files when N/A better

This commit is contained in:
2021-01-20 21:49:04 +11:00
parent aaeb4a8ffe
commit f7a94f0b7d

View File

@@ -37,17 +37,17 @@
<label class="form-control-plaintext col-lg-2">Current File:</label>
<label class="form-control-plaintext col-lg-10">{{job.current_file}}</label>
</div>
<div class="row col-lg-12">
<label class="form-control-plaintext col-lg-2">Files in pass:</label>
{% if job.num_files and job.num_files > 0 %}
<div class="row col-lg-12">
<label class="form-control-plaintext col-lg-2">Files in pass:</label>
<div class="col-lg-10 px-0">
{% set prog=(job.current_file_num/job.num_files*100)|round|int %}
<div class="progress" style="height:80%">
<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>
{% else %}
N/A
{% endif %}
<div class="col-lg-10 px-0">
{% set prog=(job.current_file_num/job.num_files*100)|round|int %}
<div class="progress" style="height:80%">
<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>
{% else %}
<label class="form-control-plaintext col-lg-10">N/A</label>
{% endif %}
</div>
</div>
<div class="row col-lg-12">
@@ -55,7 +55,7 @@
<thead><tr class="thead-light"><th>When</th><th>Details</th></tr></thead>
<tbody>
{% for log in logs %}
<tr><td>{{log.log_date|vicdate}}</td><td>{{log.log}}</td></tr>
<tr><td>{{log.log_date|vicdate}}</td><td>{{log.log|safe}}</td></tr>
{% endfor %}
</tbody>
</table>