diff --git a/var/www/Flask_server.py b/var/www/Flask_server.py
index 1ab98d60..48d4c3df 100755
--- a/var/www/Flask_server.py
+++ b/var/www/Flask_server.py
@@ -483,15 +483,20 @@ def sentiment_analysis_getplotdata():
getAllProviders = request.args.get('getProviders')
provider = request.args.get('provider')
+ allProvider = request.args.get('all')
if getAllProviders == 'True':
- range_providers = r_serv_charts.zrevrangebyscore('providers_set_'+ get_date_range(0)[0], '+inf', '-inf', start=0, num=8)
- # if empty, get yesterday top providers
- range_providers = r_serv_charts.zrevrangebyscore('providers_set_'+ get_date_range(1)[1], '+inf', '-inf', start=0, num=8) if range_providers == [] else range_providers
- # if still empty, takes from all providers
- if range_providers == []:
- print 'today provider empty'
+ if allProvider == "True":
range_providers = r_serv_charts.smembers('all_provider_set')
- return jsonify(range_providers)
+ return jsonify(list(range_providers))
+ else:
+ range_providers = r_serv_charts.zrevrangebyscore('providers_set_'+ get_date_range(0)[0], '+inf', '-inf', start=0, num=8)
+ # if empty, get yesterday top providers
+ range_providers = r_serv_charts.zrevrangebyscore('providers_set_'+ get_date_range(1)[1], '+inf', '-inf', start=0, num=8) if range_providers == [] else range_providers
+ # if still empty, takes from all providers
+ if range_providers == []:
+ print 'today provider empty'
+ range_providers = r_serv_charts.smembers('all_provider_set')
+ return jsonify(range_providers)
elif provider is not None:
to_return = {}
diff --git a/var/www/static/js/sentiment_trending.js b/var/www/static/js/sentiment_trending.js
index af1614c3..66fcac9e 100644
--- a/var/www/static/js/sentiment_trending.js
+++ b/var/www/static/js/sentiment_trending.js
@@ -1,5 +1,41 @@
/* Functions and config */
+function add_new_graph_today(id) {
+ return "
" +
+ "
" +
+ "Graph "+id+"" +
+ "Avg" +
+ "
" +
+ "
" +
+ "
" +
+ "" +
+ "" +
+ " | " +
+ " | " +
+ "
" +
+ "" +
+ "
" +
+ "
" +
+ "
";
+};
+function add_new_graph_week(id) {
+ return "" +
+ "
" +
+ "Graph "+id+"" +
+ "Avg" +
+ "
" +
+ "
" +
+ "
" +
+ "" +
+ "" +
+ " | " +
+ " | " +
+ "
" +
+ "" +
+ "
" +
+ "
" +
+ "
";
+}
function generate_offset_to_time(num){
var to_ret = {};
@@ -51,23 +87,45 @@
var all_graph_day_sum = 0.0;
var all_graph_hour_sum = 0.0;
+var all_graph_hour_sum_minus = 0.0;
var all_graph_hour_maxVal = 0.0;
var all_day_avg = 0.0;
var all_day_avg_maxVal = 0.0;
var graph_avg = [];
var all_data = [];
+var provider_already_loaded = [];
+var totNumGraph = 0;
+
+function draw_page(all) {
+ $.getJSON("/sentiment_analysis_getplotdata/?getProviders=True&all="+all,
+ function(data) {
+ var promises = [];
+
+ var the_length = provider_already_loaded.length == 0 ? 0 : provider_already_loaded.length;
+ for(i=0; i 0 ? 0 : 1;
all_graph_hour_maxVal = Math.abs(hour_sum) > all_graph_hour_maxVal ? Math.abs(hour_sum) : all_graph_hour_maxVal;
var curr_avg = curr_sum / (curr_sum_elem);
@@ -225,6 +284,7 @@ function query_and_plot(provider, graphNum) {
function draw_widgets() {
+
/* ---------------- Gauge ---------------- */
var gaugeOptions = {
animateEasing: true,
@@ -237,3 +297,154 @@ function draw_widgets() {
arcFillTotal: 20,
incTot: 1.0,
+ arcBgColorLight: 200,
+ arcBgColorSat: 0,
+ arcStrokeFg: 20,
+ arcStrokeBg: 30,
+
+ colorArcFg: '#FF3300',
+ animateSpeed: 1,
+
+ };
+ // Clone object
+ var gaugeOptions2 = jQuery.extend(true, {}, gaugeOptions);
+ var gaugeOptions3 = jQuery.extend(true, {}, gaugeOptions);
+
+
+
+ gaugeOptions.appendTo = '#gauge_today_last_hour';
+ gaugeOptions.dialLabel = 'Last hour';
+ gaugeOptions.elementId = 'gauge1';
+ var piePercent = (all_graph_hour_sum / (totNumGraph - all_graph_hour_sum_minus)) / all_graph_hour_maxVal;
+ gaugeOptions.inc = piePercent;
+ var gauge_today_last_hour = new FlexGauge(gaugeOptions);
+
+ gaugeOptions2.appendTo = '#gauge_today_last_days';
+ gaugeOptions2.dialLabel = 'Today';
+ gaugeOptions2.elementId = 'gauge2';
+ piePercent = (all_day_avg / totNumGraph) / all_day_avg_maxVal;
+ gaugeOptions2.inc = piePercent;
+ var gauge_today_last_days = new FlexGauge(gaugeOptions2);
+
+ gaugeOptions3.appendTo = '#gauge_week';
+ gaugeOptions3.dialLabel = 'Week';
+ gaugeOptions3.elementId = 'gauge3';
+
+ var graph_avg_sum = 0.0;
+ var temp_max_val = 0.0;
+ for (i=0; i temp_max_val ? Math.abs(graph_avg[i][1]) : temp_max_val;
+ }
+
+ piePercent = (graph_avg_sum / graph_avg.length) / temp_max_val;
+ gaugeOptions3.inc = piePercent;
+ var gauge_today_last_days = new FlexGauge(gaugeOptions3);
+
+
+ /* --------- Sort providers -------- */
+
+ graph_avg.sort(function(a, b){return b[1]-a[1]});
+
+ for (i=1; i<6; i++){
+ $('.worst'+i).text(graph_avg[7-(i-1)][0]);
+ $('.best'+i).text(graph_avg[i-1][0]);
+ }
+
+ /* ----------- CanvasJS ------------ */
+
+ var comp_sum_day_pos = 0.0;
+ var comp_sum_day_neg = 0.0;
+ var comp_sum_hour_pos = 0.0;
+ var comp_sum_hour_neg = 0.0;
+ for(graphNum=0; graphNumPositive: {y}",
+ type: "bar",
+ color: "green",
+ dataPoints: [
+ {y: comp_sum_hour_pos/totNumGraph}
+ ]
+ },
+ {
+ toolTipContent: "Negative: {y}",
+ type: "bar",
+ color: "red",
+ dataPoints: [
+ {y: comp_sum_hour_neg/totNumGraph}
+ ]
+ }
+ ]
+ };
+
+ var chart_canvas1 = new CanvasJS.Chart("bar_today_last_hour", options_canvasJS_1);
+
+ var options_canvasJS_2 = {
+
+ animationEnabled: true,
+ axisY: {
+ tickThickness: 0,
+ lineThickness: 0,
+ valueFormatString: " ",
+ gridThickness: 0
+ },
+ axisX: {
+ tickThickness: 0,
+ lineThickness: 0,
+ labelFontSize: 0.1,
+ },
+ data: [
+ {
+ toolTipContent: "Positive: {y}",
+ type: "bar",
+ color: "green",
+ dataPoints: [
+ {y: comp_sum_day_pos/totNumGraph}
+ ]
+ },
+ {
+ toolTipContent: "Negative: {y}",
+ type: "bar",
+ color: "red",
+ dataPoints: [
+ {y: comp_sum_day_neg/totNumGraph}
+ ]
+ }
+ ]
+ };
+
+ var chart_canvas2 = new CanvasJS.Chart("bar_today_last_days", options_canvasJS_2);
+
+ chart_canvas1.render();
+ chart_canvas2.render();
+
+}
diff --git a/var/www/templates/sentiment_analysis_trending.html b/var/www/templates/sentiment_analysis_trending.html
index 944fab1d..e1788f35 100644
--- a/var/www/templates/sentiment_analysis_trending.html
+++ b/var/www/templates/sentiment_analysis_trending.html
@@ -113,6 +113,7 @@
+
@@ -128,139 +129,13 @@
-
@@ -304,139 +179,13 @@
-
-
@@ -502,13 +249,15 @@