diff --git a/templates/joblog.html b/templates/joblog.html index 2ec3e06..84ec0b6 100644 --- a/templates/joblog.html +++ b/templates/joblog.html @@ -33,27 +33,18 @@ -
- {% set prog=(job.current_pass/job.num_passes*100)|round|int %} - -
-
-
{{job.current_pass}} of {{job.num_passes}} - {{prog}}%
-
-
-
-
- -
- {% if 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}}%
-
+ {% 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}}%
+
{% else %} N/A {% endif %} -
+
diff --git a/templates/jobs.html b/templates/jobs.html index ee543a9..3dee61e 100644 --- a/templates/jobs.html +++ b/templates/jobs.html @@ -14,10 +14,7 @@ ` {% if job.pa_job_state != "Completed" %} row +=` -
- {% set prog=(job.current_pass/job.num_passes*100)|round|int %} -
{{job.current_pass}} of {{job.num_passes}}
-
+ Not yet ` active_rows.push(row)