Merge branch 'master' into fmb-read-only

Conflicts:
	.gitignore
	bin/make_css
	perllib/FixMyStreet/Cobrand/FixMyStreet.pm

1 files changed, 124 insertions, 31 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index 0273e0eda..e4266dc64 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -3,6 +3,7 @@ use Moose;
 use namespace::autoclean;
 
 use DateTime;
+use File::Slurp;
 
 BEGIN { extends 'Catalyst::Controller'; }
 
@@ -18,6 +19,49 @@ Catalyst Controller.
 
 =cut
 
+sub example : Local : Args(0) {
+    my ( $self, $c ) = @_;
+    $c->stash->{template} = 'dashboard/index.html';
+
+    $c->stash->{children} = {};
+    for my $i (1..3) {
+        $c->stash->{children}{$i} = { id => $i, name => "Ward $i" };
+    }
+
+    # TODO Set up manual version of what the below would do
+    #$c->forward( '/report/new/setup_categories_and_councils' );
+
+    # See if we've had anything from the dropdowns - perhaps vary results if so
+    $c->stash->{ward} = $c->req->param('ward');
+    $c->stash->{category} = $c->req->param('category');
+    $c->stash->{q_state} = $c->req->param('state');
+
+    eval {
+        my $data = File::Slurp::read_file(
+            FixMyStreet->path_to( 'data/dashboard.json' )->stringify
+        );
+        my $j = JSON->new->utf8->decode($data);
+        if ( !$c->stash->{ward} && !$c->stash->{category} ) {
+            $c->stash->{problems} = $j->{counts_all};
+        } else {
+            $c->stash->{problems} = $j->{counts_some};
+        }
+        $c->stash->{council} = $j->{council};
+        $c->stash->{children} = $j->{wards};
+        $c->stash->{category_options} = $j->{category_options};
+        if ( lc($c->stash->{q_state}) eq 'all' or !$c->stash->{q_state} ) {
+            $c->stash->{lists} = $j->{lists}->{all};
+        } else {
+            $c->stash->{lists} = $j->{lists}->{filtered};
+        }
+    };
+    if ($@) {
+        $c->stash->{message} = _("There was a problem showing this page. Please try again later.") . ' ' .
+            sprintf(_('The error was: %s'), $@);
+        $c->stash->{template} = 'errors/generic.html';
+    }
+}
+
 =head2 check_page_allowed
 
 Checks if we can view this page, and if not redirect to 404.
@@ -48,20 +92,21 @@ sub index : Path : Args(0) {
 
     # Set up the data for the dropdowns
 
+    my $council_detail = mySociety::MaPit::call('area', $council );
+    $c->stash->{council} = $council_detail;
+
     my $children = mySociety::MaPit::call('area/children', $council,
         type => $mySociety::VotingArea::council_child_types,
     );
     $c->stash->{children} = $children;
 
-    # XXX Hmm, this is probably the best way to go
-    $c->stash->{all_councils} = { $council => { id => $council } };
+    $c->stash->{all_councils} = { $council => $council_detail };
     $c->forward( '/report/new/setup_categories_and_councils' );
 
     # See if we've had anything from the dropdowns
 
     $c->stash->{ward} = $c->req->param('ward');
     $c->stash->{category} = $c->req->param('category');
-    $c->stash->{q_state} = $c->req->param('state');
 
     my %where = (
         council => $council, # XXX This will break in a two tier council. Restriction needs looking at...
@@ -71,40 +116,54 @@ sub index : Path : Args(0) {
         if $c->stash->{ward};
     $where{category} = $c->stash->{category}
         if $c->stash->{category};
-    if ( $c->stash->{q_state} eq 'fixed' ) {
-        $where{'problem.state'} = [ FixMyStreet::DB::Result::Problem->fixed_states() ];
-    } elsif ( $c->stash->{q_state} ) {
-        $where{'problem.state'} = $c->stash->{q_state}
-    }
+    $c->stash->{where} = \%where;
+    my $prob_where = { %where };
+    $prob_where->{state} = $prob_where->{'problem.state'};
+    delete $prob_where->{'problem.state'};
+    $c->stash->{prob_where} = $prob_where;
 
     my %counts;
     my $t = DateTime->today;
+    $counts{wtd} = $c->forward( 'updates_search', [ $t->subtract( days => $t->dow - 1 ) ] );
+    $counts{week} = $c->forward( 'updates_search', [ DateTime->now->subtract( weeks => 1 ) ] );
+    $counts{weeks} = $c->forward( 'updates_search', [ DateTime->now->subtract( weeks => 4 ) ] );
+    $counts{ytd} = $c->forward( 'updates_search', [ DateTime->today->set( day => 1, month => 1 ) ] );
 
-    $counts{wtd} = $c->forward( 'updates_search', [ {
-        %where,
-        'me.confirmed' => { '>=', $t->subtract( days => $t->dow - 1 )
-    } } ] );
-
-    $counts{week} = $c->forward( 'updates_search', [ {
-        %where,
-        'me.confirmed' => { '>=', DateTime->now->subtract( weeks => 1 )
-    } } ] );
-
-    $counts{weeks} = $c->forward( 'updates_search', [ {
-        %where,
-        'me.confirmed' => { '>=', DateTime->now->subtract( weeks => 4 )
-    } } ] );
+    $c->stash->{problems} = \%counts;
 
-    $counts{ytd} = $c->forward( 'updates_search', [ {
-        %where,
-        'me.confirmed' => { '>=', DateTime->today->set( day => 1, month => 1 )
-    } } ] );
+    # List of reports underneath summary table
 
-    $c->stash->{problems} = \%counts;
+    $c->stash->{q_state} = $c->req->param('state') || '';
+    if ( $c->stash->{q_state} eq 'fixed' ) {
+        $prob_where->{state} = [ FixMyStreet::DB::Result::Problem->fixed_states() ];
+    } elsif ( $c->stash->{q_state} ) {
+        $prob_where->{state} = $c->stash->{q_state};
+    }
+    my $params = {
+        %$prob_where,
+        'me.confirmed' => { '>=', DateTime->now->subtract( days => 30 ) },
+    };
+    my @problems = $c->cobrand->problems->search( $params )->all;
+    my %problems;
+    foreach (@problems) {
+        if ($_->confirmed >= DateTime->now->subtract(days => 7)) {
+            push @{$problems{1}}, $_;
+        } elsif ($_->confirmed >= DateTime->now->subtract(days => 14)) {
+            push @{$problems{2}}, $_;
+        } else {
+            push @{$problems{3}}, $_;
+        }
+    }
+    $c->stash->{lists} = \%problems;
 }
 
 sub updates_search : Private {
-    my ( $self, $c, $params ) = @_;
+    my ( $self, $c, $time ) = @_;
+
+    my $params = {
+        %{$c->stash->{where}},
+        'me.confirmed' => { '>=', $time },
+    };
 
     my $comments = $c->model('DB::Comment')->search(
         $params,
@@ -124,14 +183,48 @@ sub updates_search : Private {
           'fixed - user', 'fixed', 'unconfirmed', 'hidden',
           'partial', 'planned');
 
+    for my $vars (
+        [ 'time_to_fix', 'fixed - council' ],
+        [ 'time_to_mark', 'in progress', 'planned', 'investigating', 'closed' ],
+    ) {
+        my $col = shift @$vars;
+        my $substmt = "select min(id) from comment where me.problem_id=comment.problem_id and problem_state in ('"
+            . join("','", @$vars) . "')";
+        $comments = $c->model('DB::Comment')->search(
+            { %$params,
+                problem_state => $vars,
+                'me.id' => \"= ($substmt)",
+            },
+            {
+                select   => [
+                    { count => 'me.id' },
+                    { avg => { extract => "epoch from me.confirmed-problem.confirmed" } },
+                ],
+                as       => [ qw/state_count time/ ],
+                join     => 'problem'
+            }
+        )->first;
+        $counts{$col} = int( ($comments->get_column('time')||0) / 60 / 60 / 24 + 0.5 );
+    }
+
     $counts{fixed_user} = $c->model('DB::Comment')->search(
-        { %$params, mark_fixed => 1 }, { join     => 'problem' }
+        { %$params, mark_fixed => 1, problem_state => undef }, { join     => 'problem' }
     )->count;
 
-    $params->{state} = $params->{'problem.state'};
-    delete $params->{'problem.state'};
+    $params = {
+        %{$c->stash->{prob_where}},
+        'me.confirmed' => { '>=', $time },
+    };
     $counts{total} = $c->cobrand->problems->search( $params )->count;
 
+    $params = {
+        %{$c->stash->{prob_where}},
+        'me.confirmed' => { '>=', $time },
+        state => 'confirmed',
+        '(select min(id) from comment where me.id=problem_id and problem_state is not null)' => undef,
+    };
+    $counts{not_marked} = $c->cobrand->problems->search( $params )->count;
+
     return \%counts;
 }