Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses

Conflicts:
	perllib/FixMyStreet/App/Controller/Admin.pm
	perllib/FixMyStreet/App/Controller/JSON.pm
	perllib/FixMyStreet/Map/Tilma/Original.pm
	web/css/core.css

1 files changed, 29 insertions, 2 deletions

diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index 4de8f2e5f..89f17fa60 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -161,10 +161,10 @@ sub timeline {
 }
 
 sub summary_count {
-    my ( $rs, $restriction ) = @_;
+    my ( $rs ) = @_;
 
     return $rs->search(
-        $restriction,
+        undef,
         {
             group_by => ['state'],
             select   => [ 'state', { count => 'id' } ],
@@ -173,4 +173,31 @@ sub summary_count {
     );
 }
 
+sub unique_users {
+    my ( $rs ) = @_;
+
+    return $rs->search( {
+        state => [ 'confirmed', 'fixed' ],
+    }, {
+        select => [ { count => { distinct => 'user_id' } } ],
+        as     => [ 'count' ]
+    } )->first->get_column('count');
+}
+
+sub categories_summary {
+    my ( $rs ) = @_;
+
+    my $categories = $rs->search( {
+        state    => [ 'confirmed', 'fixed' ],
+        whensent => { '<' => \"NOW() - INTERVAL '4 weeks'" },
+    }, {
+        select   => [ 'category', { count => 'id' }, { count => \"case when state='fixed' then 1 else null end" } ],
+        as       => [ 'category', 'c', 'fixed' ],
+        group_by => [ 'category' ],
+        result_class => 'DBIx::Class::ResultClass::HashRefInflator'
+    } );
+    my %categories = map { $_->{category} => { total => $_->{c}, fixed => $_->{fixed} } } $categories->all;
+    return \%categories;
+}
+
 1;