From 3a73b9546db28ea2ec33f2d001f6f9e4f4c6743e Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Tue, 19 Jan 2021 23:31:37 +1100
Subject: [PATCH] KLUDGE around num_passes for now, jobs need a clean up before
 I finish the new wait_for jobs

---
 templates/joblog.html | 27 +++++++++------------------
 templates/jobs.html   |  5 +----
 2 files changed, 10 insertions(+), 22 deletions(-)

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 @@
 		<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">
-		{% set prog=(job.current_pass/job.num_passes*100)|round|int %}
-		<label class="form-control-plaintext col-lg-2">Passes:</label>
-		<div class="col-lg-10 px-0">
-			<div class="progress" style="height:80%">
-				<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>
-		</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>
+    {% 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>
+	</div>
 	</div>
     <div class="row col-lg-12">
         <table id="jobort_tbl" class="table table-striped table-sm" data-toolbar="#toolbar" data-search="true">
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 +=`
-            <div class="progress">
-                {% 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>
+            Not yet
         </td></tr>
         `
             active_rows.push(row)