[FMS] Make dashboard categories multi-select

Switch categories list on dashborad to multi checkbox
rather than single option.

First step towards:

mysociety/societyworks#1458

bin/csv-export

@@ -60,10 +60,12 @@ my $user = FixMyStreet::DB->resultset("User")->find($opts->user) if $opts->user;
 my $body = FixMyStreet::DB->resultset("Body")->find($opts->body) if $opts->body;
 my $wards = $opts->wards ? [split',', $opts->wards] : [];
 
+my $category = $opts->category ? [split'::', $opts->category] : [];
+
 my $reporting = FixMyStreet::Reporting->new(
     type => $opts->type,
     user => $user,
-    category => $opts->category,
+    category => $category,
     state => $opts->state,
     role_id => $opts->role_id,
     wards => $wards,

perllib/FixMyStreet/App/Controller/Dashboard.pm

@@ -127,7 +127,10 @@ sub index : Path : Args(0) {
         $c->forward('/report/stash_category_groups', [ $c->stash->{contacts} ]);
 
         # See if we've had anything from the body dropdowns
-        $c->stash->{category} = $c->get_param('category');
+        $c->stash->{category} = [ $c->get_param_list('category') ];
+        my %display_categories = map { $_ => 1 } @{$c->stash->{category}};
+        $c->stash->{display_categories} = \%display_categories;
+
         $c->stash->{ward} = [ $c->get_param_list('ward') ];
 
         if ($c->user_exists) {

perllib/FixMyStreet/Cobrand/TfL.pm

@@ -237,8 +237,9 @@ sub dashboard_export_problems_add_columns {
 
     my @contacts = $csv->body->contacts->search(undef, { order_by => [ 'category' ] } )->all;
     my %extra_columns;
-    if ($csv->category) {
-        @contacts = grep { $_->category eq $csv->category } @contacts;
+    if (@{$csv->category}) {
+        my %picked_cats = map { $_ => 1} @{$csv->category};
+        @contacts = grep { $picked_cats{$_->category} } @contacts;
     }
     foreach my $contact (@contacts) {
         foreach (@{$contact->get_metadata_for_storage}) {

perllib/FixMyStreet/Reporting.pm

@@ -18,7 +18,7 @@ has on_updates => ( is => 'lazy', default => sub { $_[0]->type eq 'updates' } );
 
 has body => ( is => 'ro', isa => Maybe[InstanceOf['FixMyStreet::DB::Result::Body']] );
 has wards => ( is => 'ro', isa => ArrayRef[Int], default => sub { [] } );
-has category => ( is => 'ro', isa => Maybe[Str] );
+has category => ( is => 'ro', isa => Maybe[ArrayRef[Maybe[Str]]], default => sub { [] } );
 has state => ( is => 'ro', isa => Maybe[Str] );
 has start_date => ( is => 'ro',
     isa => Str,
@@ -90,12 +90,14 @@ has csv_extra_data => ( is => 'rw', isa => CodeRef );
 has filename => ( is => 'rw', isa => Str, lazy => 1, default => sub {
     my $self = shift;
     my %where = (
-        category => $self->category,
         state => $self->state,
         ward => join(',', @{$self->wards}),
         start_date => $self->start_date,
         end_date => $self->end_date,
     );
+    if ($self->category) {
+        $where{category} = @{$self->category} < 3 ? join(',', @{$self->category}) : 'multiple-categories';
+    }
     $where{body} = $self->body->id if $self->body;
     $where{role} = $self->role_id if $self->role_id;
     my $host = URI->new($self->cobrand->base_url)->host;
@@ -121,7 +123,7 @@ sub construct_rs_filter {
     $where{areas} = [ map { { 'like', "%,$_,%" } } @{$self->wards} ]
         if @{$self->wards};
     $where{"$table_name.category"} = $self->category
-        if $self->category;
+        if $self->category && @{$self->category};
 
     my $all_states = $self->cobrand->call_hook('dashboard_export_include_all_states');
     if ( $self->state && FixMyStreet::DB::Result::Problem->fixed_states->{$self->state} ) { # Probably fixed - council
@@ -375,9 +377,10 @@ sub kick_off_process {
     my $cmd = FixMyStreet->path_to('bin/csv-export');
     $cmd .= ' --cobrand ' . $self->cobrand->moniker;
     $cmd .= " --out \Q$out\E";
-    foreach (qw(type category state start_date end_date)) {
+    foreach (qw(type state start_date end_date)) {
         $cmd .= " --$_ " . quotemeta($self->$_) if $self->$_;
     }
+    $cmd .= " --category " . join('::', map { quotemeta } @{$self->category}) if ($self->category && @{$self->category});
     foreach (qw(body user)) {
         $cmd .= " --$_ " . $self->$_->id if $self->$_;
     }
@@ -490,7 +493,7 @@ sub filter_premade_csv {
         }
 
         my $category = $row->{Subcategory} || $row->{Category};
-        next if $self->category && $category ne $self->category;
+        next if ($self->category && @{$self->category}) && !grep { /$category/ } @{$self->category};
 
         if ( $self->state && $fixed_states->{$self->state} ) { # Probably fixed - council
             next unless $fixed_states->{$row->{$state_column}};

t/app/controller/dashboard.t

@@ -159,7 +159,7 @@ FixMyStreet::override_config {
 
     subtest 'The correct categories and totals shown by default' => sub {
         $mech->get_ok("/dashboard");
-        my $expected_cats = [ 'All', 'Litter', 'Other', 'Traffic lights & bells', 'Potholes' ];
+        my $expected_cats = [ 'Litter', 'Other', 'Traffic lights & bells', 'Potholes' ];
         my $res = $categories->scrape( $mech->content );
         $mech->content_contains('<optgroup label="Road">');
         is_deeply( $res->{cats}, $expected_cats, 'correct list of categories' );
@@ -179,6 +179,8 @@ FixMyStreet::override_config {
         my $end = DateTime->now->subtract(months => 1)->strftime('%Y-%m-%d');
         $mech->submit_form_ok({ with_fields => { state => '', start_date => $start, end_date => $end } });
         test_table($mech->content, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 3, 3, 0, 0, 3);
+        $mech->get_ok("/dashboard?category=Litter&category=Potholes");
+        test_table($mech->content, 1, 0, 0, 1, 0, 0, 0, 0, 2, 0, 4, 6, 0, 0, 0, 0, 3, 0, 4, 7);
     };
 
     subtest 'test grouping' => sub {
@@ -198,6 +200,16 @@ FixMyStreet::override_config {
         $mech->content_contains('role-' . $role->id, "File link created with role");
     };
 
+    subtest 'csv for multiple categories' => sub {
+        $mech->get_ok("/dashboard?category=Litter&category=Potholes&export=2");
+        $mech->content_contains('www.example.org-body-' . $body->id . '-category-Litter,Potholes-start_date-2014-01-02.csv');
+        $mech->get_ok("/dashboard?category=Litter&category=Potholes&category=Traffic+lights+&amp;+bells&export=2");
+        $mech->content_contains('www.example.org-body-' . $body->id . '-category-multiple-categories-start_date-2014-01-02.csv');
+        $mech->get_ok("/dashboard?category=Litter&category=Potholes&export=1");
+        my @rows = $mech->content_as_csv;
+        is scalar @rows, 8, '1 (header) + 7 (reports) found = 8 lines';
+    };
+
     subtest 'export as csv' => sub {
         $mech->create_problems_for_body(1, $body->id, 'Title', {
             detail => "this report\nis split across\nseveral lines",

templates/web/base/dashboard/index.html

@@ -51,9 +51,10 @@ <h1>[% loc('Summary statistics') %]</h1>
 
     <p>
         <label for="category">[% loc('Category:') %]</label>
-        <select class="form-control" name="category" id="category"><option value=''>[% loc('All') %]</option>
+        <select class="form-control js-multiple" multiple name="category" id="category">
             [% BLOCK category_option %]
-                <option value='[% cat.category | html %]'[% ' selected' IF category == cat.category %]>[% cat.category_display | html %]</option>
+            [% SET category = cat.category | html %]
+                <option value='[% cat.category | html %]'[% ' selected' IF display_categories.$category %]>[% cat.category_display | html %]</option>
             [% END %]
             [%~ INCLUDE 'report/new/_category_select.html' ~%]
         </select>