From 9f6cd2687c6a859576b7ba19e7419c1e5847b2f3 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 24 Sep 2020 12:12:55 +0200 Subject: Stats for containers --- ishtar_common/static/js/ishtar.js | 25 +++++++++++++++++++++- .../templates/blocks/DataTables-stats.html | 15 ++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 60ebb0bc9..da1a47de6 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -1529,9 +1529,17 @@ var stats_current_graph; var _render_stats_empty = function(stats_values, name){ $("#charts-" + name).hide(); $("#stats-table-" + name).hide(); + $("#stats-error-" + name).hide(); $("#stats-empty-" + name).show(); }; +var _render_stats_too_many_values = function(name){ + $("#charts-" + name).hide(); + $("#stats-empty-" + name).hide(); + $("#stats-table-" + name).hide(); + $("#stats-error-" + name).show(); +} + var _render_stats_table = function(stats_values, name){ var modality_1 = $("#stats_modality_1-" + name).val(); var modality_2 = $("#stats_modality_2-" + name).val(); @@ -1596,6 +1604,7 @@ var _render_stats_table = function(stats_values, name){ html += ""; $("#charts-" + name).hide(); $("#stats-empty-" + name).hide(); + $("#stats-error-" + name).hide(); $("#stats-table-content-" + name).html(html); $("#stats-table-" + name).show(); @@ -1605,6 +1614,9 @@ var _render_stats_table = function(stats_values, name){ $("#stats-table-csv-" + name).attr("download", "ishtar-stats.csv"); }; +var MAX_STATS_GRAPH_VALUES = 100; +var MAX_STATS_GRAPH_MODALITY_VALUES = 100; + var render_stats = function(stats_values, name){ var stats_type = $("#stats_renderer-" + name).val(); @@ -1622,12 +1634,23 @@ var render_stats = function(stats_values, name){ return _render_stats_table(stats_values, name); } + if (stats_values.length > MAX_STATS_GRAPH_VALUES){ + _render_stats_too_many_values(name); + return; + } + for (idx in stats_values){ + if (stats_values[idx][1].length > MAX_STATS_GRAPH_MODALITY_VALUES){ + _render_stats_too_many_values(name); + return; + } + } + $("#stats-table-" + name).hide(); $("#stats-empty-" + name).hide(); + $("#stats-error-" + name).hide(); $("#charts-" + name).show(); var modality_1 = $("#stats_modality_1-" + name).val(); var modality_2 = $("#stats_modality_2-" + name).val(); - stats_xaxis = { label: $('#stats_modality_1-' + name + ' option:selected').text() }; diff --git a/ishtar_common/templates/blocks/DataTables-stats.html b/ishtar_common/templates/blocks/DataTables-stats.html index febb8f5a3..342051d19 100644 --- a/ishtar_common/templates/blocks/DataTables-stats.html +++ b/ishtar_common/templates/blocks/DataTables-stats.html @@ -79,7 +79,20 @@
- {% trans "No data" %} +

+   + {% trans "No data" %} +

+
+
+
+   + {% trans "Too many values for the selected modalities, graph cannot be displayed. You can: " %} +
    +
  • {% trans 'Select "table" type.'%}
  • +
  • {% trans 'Refine the search to limit the results.'%}
  • +
+
-- cgit v1.2.3