Merge 508e57f into 0916743

joola · Oct 31, 2013 · cfa9b4f · cfa9b4f
2 parents 0916743 + 508e57f
commit cfa9b4f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/lib/joolaio.visualisation.dashboard.Bar.js b/lib/joolaio.visualisation.dashboard.Bar.js
@@ -415,7 +415,7 @@ joolaio.visualisation.dashboard.Bar.prototype.update = function (sender, metrics
 
                 if (totalsum - sum > 0) {
                     //console.log('not shown from xaxis');
-                    result.push('Other');
+                    result.push('Not shown');
                 }
                 //console.log('result', result);
                 return result;
@@ -850,7 +850,7 @@ joolaio.visualisation.dashboard.Bar.prototype.update = function (sender, metrics
                     //console.log('result', result);
 
                     if (totalsum - sum > 0) {
-                        var name = 'Other';
+                        var name = 'Not Shown';
                         var y = totalsum - sum;
                         result.push({name: name, y: y, formattedy: 0, color: joolaio.colors[11]});
 
@@ -908,7 +908,7 @@ joolaio.visualisation.dashboard.Bar.prototype.update = function (sender, metrics
                 }
 
                 if (totalsum - sum > 0) {
-                    var name = 'Other';
+                    var name = 'Not shown';
                     var y = totalsum - sum;
 
                     //console.log(y);

diff --git a/lib/joolaio.visualisation.dashboard.BarTable.js b/lib/joolaio.visualisation.dashboard.BarTable.js
@@ -279,8 +279,8 @@ joolaio.visualisation.dashboard.BarTable.prototype.fetch = function (sender, con
                             sum2 += parseFloat(item.data.Result.Rows[i].Values[2]);
                     }
 
-                    lastRow.Values[0] = 'Other';
-                    lastRow.FormattedValues[0] = 'Other';
+                    lastRow.Values[0] = 'Not shown';
+                    lastRow.FormattedValues[0] = 'Not shown';
 
                     lastRow.Values[1] = sum1;
                     lastRow.FormattedValues[1] = joolaio.string.formatNumber(sum1, 0, true);
@@ -358,7 +358,7 @@ joolaio.visualisation.dashboard.BarTable.prototype.update = function (sender, di
         var $bar = $('<div class="tablebar" style="width:' + row.percentage * 100 + '%"></div>');
         $barwrapper.append($bar);
 
-        if (row.FormattedValues[0] == 'Other' && index == series[0].Rows.length - 1)
+        if (row.FormattedValues[0] == 'Not shown' && index == series[0].Rows.length - 1)
             $bar.css({'background-color': joolaio.colors[11]});
         else
             $bar.css({'background-color': joolaio.colors[0]});

diff --git a/lib/joolaio.visualisation.dashboard.Pie.js b/lib/joolaio.visualisation.dashboard.Pie.js
@@ -400,7 +400,7 @@ joolaio.visualisation.dashboard.Pie.prototype.update = function (sender, dimensi
                     });
 
                     if (100 - Math.floor(sum) > 0) {
-                        var name = 'Other';
+                        var name = 'Not shown';
                         var y = 100 - sum;
                         result.push({name: name, y: y, color: joolaio.colors[11]});
                     }
@@ -458,7 +458,7 @@ joolaio.visualisation.dashboard.Pie.prototype.update = function (sender, dimensi
                         });
 
                         if (100 - Math.floor(sum) > 0) {
-                            var name = 'Other';
+                            var name = 'Not shown';
                             var y = 100 - sum;
                             result.push({name: name, y: y, color: joolaio.colors[11]});
                         }
@@ -507,7 +507,7 @@ joolaio.visualisation.dashboard.Pie.prototype.update = function (sender, dimensi
 
 
     if (totalsum - shownsum > 0) {
-        var name = 'Other';
+        var name = 'Not shown';
         var y = 100 - sum;
         result.push({name: name, y: y, color: joolaio.colors[11], value: joolaio.string.formatNumber(totalsum - shownsum, 0, true), seriesname: columns[columns.length - 1].name});
     }

diff --git a/lib/joolaio.visualisation.dashboard.Table.js b/lib/joolaio.visualisation.dashboard.Table.js
@@ -278,8 +278,8 @@ joolaio.visualisation.dashboard.Table.prototype.fetch = function (sender, contai
                             sum2 += parseFloat(item.data.Result.Rows[i].Values[2]);
                     }
 
-                    lastRow.Values[0] = 'Other';
-                    lastRow.FormattedValues[0] = 'Other';
+                    lastRow.Values[0] = 'Not shown';
+                    lastRow.FormattedValues[0] = 'Not shown';
 
                     lastRow.Values[1] = sum1;
                     sum1 = joolaio.string.formatNumber(sum1, 0, true);