diff options
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Dashboard.pm | 13 | ||||
| -rw-r--r-- | web/js/dashboard.js | 4 |
2 files changed, 7 insertions, 10 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm index 90f3866ec..926e941f6 100644 --- a/perllib/FixMyStreet/App/Controller/Dashboard.pm +++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm @@ -115,7 +115,8 @@ sub index : Path : Args(0) { if ( $c->get_param('export') ) { $c->forward('export_as_csv'); } else { - $self->generate_data($c); + $c->forward('generate_grouped_data'); + $self->generate_summary_figures($c); } } @@ -168,7 +169,7 @@ sub construct_rs_filter : Private { $c->stash->{problems_rs} = $c->cobrand->problems->to_body($c->stash->{body})->search( \%where ); } -sub generate_data { +sub generate_grouped_data : Private { my ($self, $c) = @_; my $state_map = $c->stash->{state_map} = {}; @@ -176,14 +177,6 @@ sub generate_data { $state_map->{$_} = 'closed' foreach FixMyStreet::DB::Result::Problem->closed_states; $state_map->{$_} = 'fixed' foreach FixMyStreet::DB::Result::Problem->fixed_states; - $c->forward('generate_grouped_data'); - $self->generate_summary_figures($c); -} - -sub generate_grouped_data : Private { - my ($self, $c) = @_; - my $state_map = $c->stash->{state_map}; - my $group_by = $c->get_param('group_by') || $c->stash->{group_by_default} || ''; my (%grouped, @groups, %totals); if ($group_by eq 'category') { diff --git a/web/js/dashboard.js b/web/js/dashboard.js index 3bac4f983..a6e06e048 100644 --- a/web/js/dashboard.js +++ b/web/js/dashboard.js @@ -179,6 +179,10 @@ $(function(){ rowValues.push( parseInt($(this).find('td').text(), 10) ); }); + for (var i=colours.length; i<rowLabels.length; i++) { + colours[i] = colours[i % colours.length]; + } + var barChart = new Chart($canvas, { type: 'horizontalBar', data: { |