paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 06:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

analytics: Fix rangeselector buttons for messages_sent_over_time.

Browse Source 
Previously was using the daily_rangeselector regardless of whether we
started in the daily or weekly view.
This commit is contained in:
Rishi Gupta
2017-02-06 17:44:46 -08:00
committed by Tim Abbott
parent d71f2e7b9b
commit 86b45b57df
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
static/js/portico/stats.js
View File

@@ -277,15 +277,21 @@ function populate_messages_sent_over_time(data) {
// Generate plot // Generate plot
var layout = messages_sent_over_time_layout(); var layout = messages_sent_over_time_layout();
var default_rangeselector = messages_sent_over_time_rangeselector( var hourly_rangeselector = messages_sent_over_time_rangeselector(
0.66, -0.62, 24, 'Last 24 Hours', 'hour', 72, 'Last 72 Hours', 'hour');
// also the cumulative rangeselector
var daily_rangeselector = messages_sent_over_time_rangeselector(
0.68, -0.62, 10, 'Last 10 Days', 'day', 30, 'Last 30 Days', 'day'); 0.68, -0.62, 10, 'Last 10 Days', 'day', 30, 'Last 30 Days', 'day');
layout.xaxis.rangeselector = default_rangeselector; var weekly_rangeselector = messages_sent_over_time_rangeselector(
0.656, -0.62, 2, 'Last 2 Months', 'month', 6, 'Last 6 Months', 'month');
if (info.dates.length < 12) { if (info.dates.length < 12) {
layout.xaxis.rangeselector = daily_rangeselector;
Plotly.newPlot('id_messages_sent_over_time', Plotly.newPlot('id_messages_sent_over_time',
[daily_traces.human, daily_traces.bot], layout, {displayModeBar: false}); [daily_traces.human, daily_traces.bot], layout, {displayModeBar: false});
$('#daily_button').css('background', '#D8D8D8'); $('#daily_button').css('background', '#D8D8D8');
} else { } else {
layout.xaxis.rangeselector = weekly_rangeselector;
Plotly.newPlot('id_messages_sent_over_time', Plotly.newPlot('id_messages_sent_over_time',
[weekly_traces.human, weekly_traces.bot], layout, {displayModeBar: false}); [weekly_traces.human, weekly_traces.bot], layout, {displayModeBar: false});
$('#weekly_button').css('background', '#D8D8D8'); $('#weekly_button').css('background', '#D8D8D8');
@@ -317,24 +323,20 @@ function populate_messages_sent_over_time(data) {
} }
$('#hourly_button').click(function () { $('#hourly_button').click(function () {
var rangeselector = messages_sent_over_time_rangeselector( update_plot_on_aggregation_click(hourly_rangeselector, hourly_traces);
0.66, -0.62, 24, 'Last 24 Hours', 'hour', 72, 'Last 72 Hours', 'hour');
update_plot_on_aggregation_click(rangeselector, hourly_traces);
$(this).css('background', '#D8D8D8'); $(this).css('background', '#D8D8D8');
clicked_cumulative = false; clicked_cumulative = false;
}); });
$('#daily_button').click(function () { $('#daily_button').click(function () {
update_plot_on_aggregation_click(default_rangeselector, daily_traces); update_plot_on_aggregation_click(daily_rangeselector, daily_traces);
$(this).css('background', '#D8D8D8'); $(this).css('background', '#D8D8D8');
clicked_cumulative = false; clicked_cumulative = false;
}); });
$('#weekly_button').click(function () { $('#weekly_button').click(function () {
var rangeselector = messages_sent_over_time_rangeselector( update_plot_on_aggregation_click(weekly_rangeselector, weekly_traces);
0.656, -0.62, 2, 'Last 2 Months', 'month', 6, 'Last 6 Months', 'month');
update_plot_on_aggregation_click(rangeselector, weekly_traces);
$(this).css('background', '#D8D8D8'); $(this).css('background', '#D8D8D8');
clicked_cumulative = false; clicked_cumulative = false;
fix_legend_colors(); fix_legend_colors();
@@ -348,7 +350,7 @@ function populate_messages_sent_over_time(data) {
$('#cumulative_button').click(function () { $('#cumulative_button').click(function () {
clicked_cumulative = false; clicked_cumulative = false;
update_plot_on_aggregation_click(default_rangeselector, cumulative_traces); update_plot_on_aggregation_click(daily_rangeselector, cumulative_traces);
$(this).css('background', '#D8D8D8'); $(this).css('background', '#D8D8D8');
clicked_cumulative = true; clicked_cumulative = true;
}); });