From d8285eb2bb8bfdffaf97131ab9b12f8c9ce2758e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= Date: Wed, 31 May 2023 01:35:40 +0200 Subject: [PATCH] Add excel to report datasets --- benchmark/ResultsFiles.py | 4 +-- benchmark/scripts/be_flask.py | 8 ++++-- benchmark/scripts/templates/datasets.html | 27 ++++++++++++++++--- .../templates/partials/datasets_table.html | 4 +-- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/benchmark/ResultsFiles.py b/benchmark/ResultsFiles.py index cfa8fde..8499cc4 100644 --- a/benchmark/ResultsFiles.py +++ b/benchmark/ResultsFiles.py @@ -299,11 +299,11 @@ class ReportDatasets: color2 = "#FDE9D9" color3 = "#B1A0C7" - def __init__(self, excel=False, book=None): + def __init__(self, excel=False, book=None, output=True): self.excel = excel self.env = EnvData().load() self.close = False - self.output = True + self.output = output self.header_text = f"Datasets used in benchmark ver. {__version__}" if excel: self.max_length = 0 diff --git a/benchmark/scripts/be_flask.py b/benchmark/scripts/be_flask.py index 653cf72..721c8fe 100755 --- a/benchmark/scripts/be_flask.py +++ b/benchmark/scripts/be_flask.py @@ -6,7 +6,7 @@ import xlsxwriter from benchmark.Utils import Files, Folders from benchmark.Arguments import EnvData from benchmark.ResultsBase import StubReport -from benchmark.ResultsFiles import Excel +from benchmark.ResultsFiles import Excel, ReportDatasets from benchmark.Datasets import Datasets from flask import Flask from flask import render_template, request, redirect, url_for @@ -121,7 +121,11 @@ def excel(): book = None if selected_files[0] == "datasets": # Create a list of datasets - return AjaxResponse(True, "datasets").to_string() + report = ReportDatasets(excel=True, output=False) + report.report() + excel_name = os.path.join(Folders.excel, Files.datasets_report_excel) + Files.open(excel_name, test=app.config[TEST]) + return AjaxResponse(True, Files.datasets_report_excel).to_string() try: for file_name in selected_files: file_name_result = os.path.join(Folders.results, file_name) diff --git a/benchmark/scripts/templates/datasets.html b/benchmark/scripts/templates/datasets.html index 84063ab..809bbf0 100644 --- a/benchmark/scripts/templates/datasets.html +++ b/benchmark/scripts/templates/datasets.html @@ -6,7 +6,8 @@ {% set table_class = "table table-striped table-hover table-bordered" %} {% set head_class = "bg-primary text-white" %} {% set text_right = "text-end" %} - {% set container = "container-fluid" %} + {% set container = "container" %} + {% set selected = "selected" %} {% else %} {% set close_button = '' %} {% set button_class = "button is-primary is-small" %} @@ -14,17 +15,35 @@ {% set table_class = "table is-striped is-hoverable cell-border is-bordered" %} {% set head_class = "is-selected" %} {% set text_right = "has-text-right" %} - {% set container = "container is-fluid" %} + {% set container = "container" %} + {% set selected = "is-selected" %} {% endif %} {% block content %}
-

{{ close_button|safe }} Datasets Report

- +

{{ close_button|safe }} Benchmark Datasets Report

+ {% include "partials/datasets_table.html" %}
{% endblock %} {% block jscript %} {% endblock %} \ No newline at end of file diff --git a/benchmark/scripts/templates/partials/datasets_table.html b/benchmark/scripts/templates/partials/datasets_table.html index 4bd13ab..1130914 100644 --- a/benchmark/scripts/templates/partials/datasets_table.html +++ b/benchmark/scripts/templates/partials/datasets_table.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% block content %} - +
@@ -20,7 +20,7 @@ - + {% endfor %}
Dataset{{ dataset.cont_features }} {{ dataset.classes }} {{ dataset.balance }}