From d6b2b266a91d3a7712dae8fccd65462b9e047cc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= <rmontanana@gmail.com>
Date: Sat, 10 Jun 2023 01:44:22 +0200
Subject: [PATCH] Fix ranking mistakes

---
 app/interactive/main_interactive.py    | 18 +++++++++++-------
 app/interactive/templates/ranking.html |  6 ++----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/interactive/main_interactive.py b/app/interactive/main_interactive.py
index edaf579..11ce63c 100644
--- a/app/interactive/main_interactive.py
+++ b/app/interactive/main_interactive.py
@@ -48,9 +48,9 @@ def get_benchmark(score, excel=False, html=False):
         shutil.copytree(src, dst, dirs_exist_ok=True)
 
     def progress(step):
-        values = [0, 20, 40, 60, 80]
+        values = [0, 40, 60, 80]
         if excel:
-            values = [0, 40, 60, 80, 100]
+            values = [0, 20, 40, 60, 80, 100]
         return values[step]
 
     benchmark = Benchmark(score=score, visualize=html)
@@ -84,9 +84,15 @@ def get_benchmark(score, excel=False, html=False):
         )
         return
     # copy the results to the static folder
-    move_exreport()
+    if html:
+        move_exreport()
     excel_payload = (
-        "" if not excel else str(Path(benchmark.get_excel_file_name()))
+        "" if not excel else str(Path(benchmark.get_excel_file_name()).name)
+    )
+    html_payload = (
+        ""
+        if not html
+        else url_for("static", filename="exreport/exreport_output/report.html")
     )
     current_app.logger.info("excel_payload:" + excel_payload)
     send_message(
@@ -94,8 +100,6 @@ def get_benchmark(score, excel=False, html=False):
         100,
         payload={
             "excel": excel_payload,
-            "html": url_for(
-                "static", filename="exreport/exreport_output/report.html"
-            ),
+            "html": html_payload,
         },
     )
diff --git a/app/interactive/templates/ranking.html b/app/interactive/templates/ranking.html
index 61b0e41..c906c9b 100644
--- a/app/interactive/templates/ranking.html
+++ b/app/interactive/templates/ranking.html
@@ -112,10 +112,7 @@
             }
             if (msg.message == "Done!") {
                 if ($("#excel").is(":checked")) {
-                    let action = "window.open('/results/download/" + msg.payload.excel +"', '_blank')";
-                    alert(action);
-                    console.log(action);
-                    $("#excel").attr("onclick",action);
+                    $("#excel_button").attr("onclick", "window.open('/results/download/" + msg.payload.excel +"', '_blank')");
                     $("#excel_button").removeAttr("hidden");
                 }
                 if ($("#html").is(":checked")) {
@@ -139,6 +136,7 @@
             $("#status").removeAttr("hidden");
             $("#status-alert").removeAttr("hidden");
             $(".progress").removeAttr("hidden");
+            $("#submit").attr("hidden", true);
         }
         function send() {
             var data= {