Stats JS: manage no data

3 files changed, 18 insertions, 3 deletions

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index b9a94af21..53223c477 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -1464,6 +1464,12 @@ var stats_showmarker = false;
 var stats_incompatible_modality = "This graph type accept only one modality.";
 var stats_current_graph;
 
+var _render_stats_empty = function(stats_values, name){
+    $("#charts-" + name).hide();
+    $("#stats-table-" + name).hide();
+    $("#stats-empty-" + 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();
@@ -1522,6 +1528,7 @@ var _render_stats_table = function(stats_values, name){
 
     html += "</tbody></table>";
     $("#charts-" + name).hide();
+    $("#stats-empty-" + name).hide();
     $("#stats-table-content-" + name).html(html);
     $("#stats-table-" + name).show();
 
@@ -1534,7 +1541,11 @@ var _render_stats_table = function(stats_values, name){
 var render_stats = function(stats_values, name){
     var stats_type = $("#stats_renderer-" + name).val();
 
-    if (!stats_values || !stats_values['data']) return;
+    if (!stats_values || !stats_values['data']
+        || stats_values['data'].length == 0){
+        return _render_stats_empty(stats_values, name);
+    }
+
     stats_values = stats_values['data'];
 
     if (stats_current_graph){
@@ -1545,6 +1556,7 @@ var render_stats = function(stats_values, name){
     }
 
     $("#stats-table-" + name).hide();
+    $("#stats-empty-" + name).hide();
     $("#charts-" + name).show();
     var modality_1 = $("#stats_modality_1-" + name).val();
     var modality_2 = $("#stats_modality_2-" + name).val();
diff --git a/ishtar_common/templates/blocks/DataTables-stats.html b/ishtar_common/templates/blocks/DataTables-stats.html
index b17112200..febb8f5a3 100644
--- a/ishtar_common/templates/blocks/DataTables-stats.html
+++ b/ishtar_common/templates/blocks/DataTables-stats.html
@@ -78,6 +78,9 @@
             </a>
         </div>
     </div>
+    <div id="stats-empty-{{name}}">
+        {% trans "No data" %}
+    </div>
 </div>
 
 <script language="javascript" type="text/javascript">
diff --git a/version.py b/version.py
index dcab8451d..bad2fd4e5 100644
--- a/version.py
+++ b/version.py
@@ -1,5 +1,5 @@
-# 3.0.dev.1
-VERSION = (3, 0, 'dev', 1)
+# 3.0.dev.2
+VERSION = (3, 0, 'dev', 2)
 
 
 def get_version():