From eb8b0d355403feb58f91ac21aa856b33dd0968c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Montan=CC=83ana?= <rmontanana@gmail.com>
Date: Tue, 6 Jun 2023 00:59:10 +0200
Subject: [PATCH] Add report best results

---
 app/app.db                        | Bin 28672 -> 28672 bytes
 app/results/main_select.py        |  12 ++++++------
 app/results/templates/best.html   |  31 ++++++++++++++++++++++++++++++
 app/results/templates/report.html |   2 +-
 app/static/js/report.js           |  17 ++++++++++++++++
 5 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 app/results/templates/best.html
 create mode 100644 app/static/js/report.js

diff --git a/app/app.db b/app/app.db
index fe7a75abe9f9f98fdeb65606cfcb4d4e5e24c465..9791b97065606ff5d6575e8fa2740d4f88e673f0 100644
GIT binary patch
delta 61
zcmV-D0K)%(-~oW(0gxL3<&hji0p+n^p+5@%0006G>HrUM4(hWJ5KayR4{-pHlU`1X
T0RxljPKN}63;_tUbx(^Rf2R|;

delta 61
zcmZp8z}WDBae_4C!-+D^j1M;^EVSq5FJxfii(=r5;(N7OP{5CmrIDABV{)8dHzU*J
RSAOj*3=9nYn@jz>6##FZ69)hQ

diff --git a/app/results/main_select.py b/app/results/main_select.py
index eacb9b1..e3edf0b 100644
--- a/app/results/main_select.py
+++ b/app/results/main_select.py
@@ -7,7 +7,6 @@ from flask_login import current_user
 from flask import Blueprint, current_app, send_file
 from flask import render_template, current_app, request, redirect, url_for
 from flask_login import login_required
-from ..config import Config
 
 # import shutil
 # import xlsxwriter
@@ -76,11 +75,12 @@ def datasets():
 @login_required
 def best(file_name):
     os.chdir(current_user.benchmark.folder)
-    dt = Datasets()
-    datos = []
-    for dataset in dt:
-        datos.append(dt.get_attributes(dataset))
-    return render_template("datasets.html", datasets=datos)
+    try:
+        with open(os.path.join(Folders.results, file_name)) as f:
+            data = json.load(f)
+    except Exception as e:
+        return render_template("error.html", message=str(e))
+    return render_template("best.html", data=data)
 
 
 @results.route("/set_compare", methods=["POST"])
diff --git a/app/results/templates/best.html b/app/results/templates/best.html
new file mode 100644
index 0000000..9ab638e
--- /dev/null
+++ b/app/results/templates/best.html
@@ -0,0 +1,31 @@
+{% extends "base.html" %}
+{% block content %}
+    <table id="file-table"
+           class="table table-striped table-hover table-bordered bg-light">
+        <thead>
+            <tr class="bg-primary text-white">
+                <th class="text-center">Dataset</th>
+                <th class="text-center">Score</th>
+                <th class="text-center">Hyperparameters</th>
+                <th class="text-center">File</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for dataset, info in data.items() %}
+                <tr>
+                    <td>{{ dataset }}</td>
+                    <td class="text-end">{{ '%9.7f' % info[0] }}</td>
+                    <td class="text-center">{{ info[1] }}</td>
+                    <td>
+                        {% set url = url_for(request.endpoint, **request.view_args)|urlencode %}
+                        <a href="{{ url_for('results.report', file_name = info[2]) }}?url={{ url }}">{{ info[2] }}</a>
+                    </td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+{% endblock %}
+{% block jscript %}
+    {{ super() }}
+    <script src="{{ url_for('static', filename="js/report.js") }}"></script>
+{% endblock %}
diff --git a/app/results/templates/report.html b/app/results/templates/report.html
index 7fea26c..3fde409 100644
--- a/app/results/templates/report.html
+++ b/app/results/templates/report.html
@@ -4,5 +4,5 @@
 {% endblock %}
 {% block jscript %}
     {{ super() }}
-    {#<script src="{{ url_for('static', filename="js/report.js") }}"></script>#}
+    <script src="{{ url_for('static', filename="js/report.js") }}"></script>
 {% endblock %}
diff --git a/app/static/js/report.js b/app/static/js/report.js
new file mode 100644
index 0000000..449d070
--- /dev/null
+++ b/app/static/js/report.js
@@ -0,0 +1,17 @@
+$(document).ready(function () {
+    // Check if row is selected
+    $('#report-table tbody').on('click', 'tr', function () {
+        if ($(this).hasClass('selected')) {
+            $(this).removeClass('selected');
+        } else {
+            $('#report-table tbody tr.selected').removeClass("selected")
+            $(this).addClass('selected');
+        }
+    });
+    $(document).ajaxStart(function(){ 
+        $("body").addClass('ajaxLoading');
+    });
+    $(document).ajaxStop(function(){ 
+        $("body").removeClass('ajaxLoading');
+    });
+  });
\ No newline at end of file