From 511764a364b73022e1234b71678244f19210c7fa Mon Sep 17 00:00:00 2001 From: Felipe Bormann Date: Mon, 15 May 2017 20:38:01 -0300 Subject: [PATCH] fixed error when charts were redrawn --- analytics/static/analytics/js/charts.js | 8 ++++---- dashboards/static/dashboards/js/behavior.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/analytics/static/analytics/js/charts.js b/analytics/static/analytics/js/charts.js index 998e78a..3e611f9 100644 --- a/analytics/static/analytics/js/charts.js +++ b/analytics/static/analytics/js/charts.js @@ -440,10 +440,10 @@ var charts = { - - if($(div_target).lenght != 0 ){ - $(div_target).fadeOut(); - $(div_target).remove(); + + if($('#'+div_target).lenght != 0 ){ + $('#'+div_target).fadeOut(); + $('#'+div_target).remove(); } var svg = d3.select(target).append('svg') .attr('width', 300) diff --git a/dashboards/static/dashboards/js/behavior.js b/dashboards/static/dashboards/js/behavior.js index 64c9348..8dfe82a 100644 --- a/dashboards/static/dashboards/js/behavior.js +++ b/dashboards/static/dashboards/js/behavior.js @@ -8,7 +8,7 @@ $(document).ready(function(){ $('#month_selector').change(function(){ $.get('/analytics/amount_active_users_per_day', {month: $(this).val() }).done(function(data){ - charts.month_heatmap(data, '#right-chart-body', '#month-chart'); + charts.month_heatmap(data, '#right-chart-body', 'month-chart'); }); }); @@ -18,7 +18,7 @@ $(document).ready(function(){ defaultDate: new Date(), }).on('dp.change', function(ev){ $.get('/analytics/get_days_of_the_week_log', {date: ev.date._i}).done(function(data){ - charts.month_heatmap(data, '#bottom-right-chart-body', '#weekly-chart'); + charts.month_heatmap(data, '#bottom-right-chart-body', 'weekly-chart'); }); }); @@ -27,14 +27,14 @@ $(document).ready(function(){ //first call to month selector $.get('/analytics/amount_active_users_per_day', {month: $('#month_selector option')[(new Date()).getMonth()].text }).done(function(data){ $('#month_selector').val($('#month_selector option')[(new Date()).getMonth()].text); //update value to actual month - charts.month_heatmap(data, '#right-chart-body'); + charts.month_heatmap(data, '#right-chart-body', 'month-chart'); }); //first call to weekly chart var today_date = new Date(); var date = (today_date.getMonth() + 1) + '/' + today_date.getDate() + '/' + today_date.getFullYear(); $.get('/analytics/get_days_of_the_week_log', {date: date}).done(function(data){ - charts.month_heatmap(data, '#bottom-right-chart-body', '#weekly-chart'); + charts.month_heatmap(data, '#bottom-right-chart-body', 'weekly-chart'); }); -- libgit2 0.21.2