From c35ef08e4f6f51874d1ce46dce3b4895dca6fe54 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 16 Jun 2011 16:46:04 +0100
Subject: stop using hard coded names for fixed/visible states ( work in
 progress )

---
 perllib/FixMyStreet/App/Controller/Reports.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perllib/FixMyStreet/App/Controller/Reports.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index e1983c855..3f7bd268f 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -256,7 +256,7 @@ sub load_and_group_problems : Private {
     my ( $self, $c ) = @_;
 
     my $where = {
-        state => [ 'confirmed', 'fixed' ]
+        state => [ FixMyStreet::DB::Result::Problem->visible_states() ]
     };
     my @extra_cols = ();
     if ($c->stash->{ward}) {
-- 
cgit v1.2.3


From 630ed304d67f83ecd8848bf665b03fd7c27fff46 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Tue, 21 Jun 2011 16:11:42 +0100
Subject: remove more hardcoded references to fixed

---
 perllib/FixMyStreet/App/Controller/Reports.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perllib/FixMyStreet/App/Controller/Reports.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index 58b689bf9..2f895015b 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -354,7 +354,8 @@ sub add_row {
         ? 'unknown'
         : ($problem->{age} > $fourweeks ? 'older' : 'new');
     # Fixed problems are either old or new
-    push @{$fixed->{$council}{$duration_str}}, $problem if $problem->{state} eq 'fixed';
+    push @{$fixed->{$council}{$duration_str}}, $problem if
+        exists FixMyStreet::DB::Result::Problem->fixed_states()->{$problem->{state}};
     # Open problems are either unknown, older, or new
     push @{$open->{$council}{$type}}, $problem if $problem->{state} eq 'confirmed';
 }
-- 
cgit v1.2.3


From ddde474e6a1dfb1591e8cfe06dc05c8be3312853 Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Tue, 21 Jun 2011 17:54:16 +0100
Subject: check for open states instead of confirmed

---
 perllib/FixMyStreet/App/Controller/Reports.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perllib/FixMyStreet/App/Controller/Reports.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index 2f895015b..fc8c4cd0e 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -357,7 +357,8 @@ sub add_row {
     push @{$fixed->{$council}{$duration_str}}, $problem if
         exists FixMyStreet::DB::Result::Problem->fixed_states()->{$problem->{state}};
     # Open problems are either unknown, older, or new
-    push @{$open->{$council}{$type}}, $problem if $problem->{state} eq 'confirmed';
+    push @{$open->{$council}{$type}}, $problem if 
+        exists FixMyStreet::DB::Result::Problem->open_states->{$problem->{state}};
 }
 
 =head1 AUTHOR
-- 
cgit v1.2.3


From 01750786cc7f8d13f939eb75284f1d805673effe Mon Sep 17 00:00:00 2001
From: Struan Donald <struan@exo.org.uk>
Date: Thu, 18 Aug 2011 13:57:16 +0100
Subject: remove hard coded references to fixed

---
 perllib/FixMyStreet/App/Controller/Reports.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perllib/FixMyStreet/App/Controller/Reports.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index bf270a3b2..f7fb5dec5 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -420,7 +420,7 @@ sub add_row {
     push @$pins, {
         latitude  => $problem->{latitude},
         longitude => $problem->{longitude},
-        colour    => $problem->{state} eq 'fixed' ? 'green' : 'red',
+        colour    => FixMyStreet::DB::Result::Problem->fixed_states()->{$problem->{state}} ? 'green' : 'red',
         id        => $problem->{id},
         title     => $problem->{title},
     };
-- 
cgit v1.2.3