Only show time reimaining if not finished

CoolCat467 · May 17, 2024 · ec92a89 · ec92a89
1 parent dea3530
commit ec92a89
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/sanescansrv/generate_pages.py b/src/sanescansrv/generate_pages.py
@@ -437,9 +437,14 @@ def generate_scan_status_get() -> str:
                 ),
                 block=False,
             ),
-            htmlgen.wrap_tag(
-                "p",
-                f"Scan is estimated to be done in {estimate}.",
+            htmlgen.jinja_if_block(
+                {
+                    "not is_done": htmlgen.wrap_tag(
+                        "p",
+                        f"Scan is estimated to be done in {estimate}.",
+                        block=False,
+                    ),
+                },
                 block=False,
             ),
         ),

diff --git a/src/sanescansrv/templates/scan-status_get.html.jinja b/src/sanescansrv/templates/scan-status_get.html.jinja
@@ -12,7 +12,7 @@
       <h1>{% if just_started %}Just Started Scanning{% else %}Scan Is In Progress{% endif %}</h1>
       <div class="box">
         <p>{% if just_started %}Just Started.{% elif progress[0] == progress[1] %}Just finished, saving file...{% else %}<strong>{{ (progress[0] / progress[1] * 100)|round(2) }}%</strong> Complete{% endif %}</p>
-        <p>Scan is estimated to be done in <strong>{{ estimated_wait }}</strong>.</p>
+        {% if not is_done %}<p>Scan is estimated to be done in <strong>{{ estimated_wait }}</strong>.</p>{% endif %}
       </div>
       <hr>
       <i>This page will automatically refresh after {{ refreshes_after }} second{% if refreshes_after > 1 %}s{% elif refreshes_after == 0 %}s{% endif %}.</i>