Statistics: manage stats sum

1 files changed, 9 insertions, 6 deletions

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 112459e62..caff11986 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -1436,6 +1436,8 @@ var _stats_submit_search = function(query_vars, name, source){
     if (modality_1) url += '&stats_modality_1=' + modality_1;
     var modality_2 = $("#stats_modality_2-" + name).val();
     if (modality_2) url += '&stats_modality_2=' + modality_2;
+    var stats_sum_variable = $("#stats_sum-" + name).val();
+    if (stats_sum_variable) url += '&stats_sum_variable=' + stats_sum_variable;
     $.getJSON(url, function(data) {
         var timestamp = Math.floor(Date.now() / 1000);
         var stats_id = "stats-" + timestamp;
@@ -1566,7 +1568,9 @@ var render_stats = function(stats_values, name){
     var ticks = new Array();
     var series = new Array();
     var series_conf = new Array();
-    var legend_conf = {};
+    var legend_conf = {
+            show:true, location: 'ne', placement: 'outside'
+    };
     if (modality_2 && modality_2 != modality_1){
         for (idx in stats_values){
             ticks.push(stats_values[idx][0]);
@@ -1596,12 +1600,12 @@ var render_stats = function(stats_values, name){
             }
         }
         stats_xaxis['ticks'] = ticks;
-        legend_conf = {
-            show:true, location: 'e', placement: 'outside'
-        };
     } else {
         jqvalues = [stats_values];
         series.push("Total");
+        if (stats_type != "pie"){
+            legend_conf = {};
+        }
     }
     if (stats_type != "pie"){
         stats_xaxis['renderer'] = $.jqplot.CategoryAxisRenderer;
@@ -1625,8 +1629,7 @@ var render_stats = function(stats_values, name){
         }
         serie_conf["rendererOptions"] = {
             padding: 8, showDataLabels: true,
-            dataLabels: 'value',
-            fill: false, sliceMargin: 4
+            dataLabels: 'value'
         };
         series_conf.push(serie_conf);
     }