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

KLUDGE around num_passes for now, jobs need a clean up before I finish the new wait_for jobs

Browse Source
This commit is contained in:
Damien De Paoli
2021-01-19 23:31:37 +11:00
parent 325bd95f25
commit 3a73b9546d
2 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
templates/joblog.html
View File

@@ -33,27 +33,18 @@
<label class="form-control-plaintext col-lg-2">Current File:</label> <label class="form-control-plaintext col-lg-2">Current File:</label>
<label class="form-control-plaintext col-lg-10">{{job.current_file}}</label> <label class="form-control-plaintext col-lg-10">{{job.current_file}}</label>
</div> </div>
<div class="row col-lg-12"> {% if job.num_files and job.num_files > 0 %}
{% set prog=(job.current_pass/job.num_passes*100)|round|int %} <div class="row col-lg-12">
<label class="form-control-plaintext col-lg-2">Passes:</label> <label class="form-control-plaintext col-lg-2">Files in pass:</label>
<div class="col-lg-10 px-0"> <div class="col-lg-10 px-0">
<div class="progress" style="height:80%"> {% set prog=(job.current_file_num/job.num_files*100)|round|int %}
<div class="progress-bar" role="progressbar" style="width: {{prog}}%;" aria-valuenow="{{prog}}" aria-valuemin="0" aria-valuemax="100">{{job.current_pass}} of {{job.num_passes}} - {{prog}}%</div> <div class="progress" style="height:80%">
</div> <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> </div>
</div>
<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">
{% if job.num_files > 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 %} {% else %}
N/A N/A
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="row col-lg-12"> <div class="row col-lg-12">
<table id="jobort_tbl" class="table table-striped table-sm" data-toolbar="#toolbar" data-search="true"> <table id="jobort_tbl" class="table table-striped table-sm" data-toolbar="#toolbar" data-search="true">

5
templates/jobs.html
View File

@@ -14,10 +14,7 @@
` `
{% if job.pa_job_state != "Completed" %} {% if job.pa_job_state != "Completed" %}
row +=` row +=`
<div class="progress"> Not yet
{% set prog=(job.current_pass/job.num_passes*100)|round|int %}
<div class="progress-bar" role="progressbar" style="width: {{prog}}%;" aria-valuenow="{{prog}}" aria-valuemin="0" aria-valuemax="100">{{job.current_pass}} of {{job.num_passes}}</div>
</div>
</td></tr> </td></tr>
` `
active_rows.push(row) active_rows.push(row)