diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-10-02 13:01:28 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-10-02 13:01:28 +0100 |
| commit | 87cc39d560c5ec3d6ec6b44429b966210252fb19 (patch) | |
| tree | 6600a284bdaa02e098b55eccdd685aff897eed32 /perllib/FixMyStreet | |
| parent | ba53a2c2d8189ecaeca2c0e774c6dda54579dec9 (diff) | |
do not used planned status but use new action scheduled instead
NB: planned still listed in some places to account for old reports
some test coverage improvements
Diffstat (limited to 'perllib/FixMyStreet')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Dashboard.pm | 4 | ||||
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/Problem.pm | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm index e4266dc64..11792ed9f 100644 --- a/perllib/FixMyStreet/App/Controller/Dashboard.pm +++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm @@ -181,11 +181,11 @@ sub updates_search : Private { map { $_ => $counts{$_} || 0 } ('confirmed', 'investigating', 'in progress', 'closed', 'fixed - council', 'fixed - user', 'fixed', 'unconfirmed', 'hidden', - 'partial', 'planned'); + 'partial', 'action scheduled'); for my $vars ( [ 'time_to_fix', 'fixed - council' ], - [ 'time_to_mark', 'in progress', 'planned', 'investigating', 'closed' ], + [ 'time_to_mark', 'in progress', 'action scheduled', 'investigating', 'closed' ], ) { my $col = shift @$vars; my $substmt = "select min(id) from comment where me.problem_id=comment.problem_id and problem_state in ('" diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 24d6d3966..7535646ab 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -188,8 +188,8 @@ sub open_states { my $states = { 'confirmed' => 1, 'investigating' => 1, - 'planned' => 1, 'in progress' => 1, + 'planned' => 1, 'action scheduled' => 1, }; @@ -251,9 +251,9 @@ HASHREF. sub visible_states { my $states = { 'confirmed' => 1, - 'planned' => 1, 'investigating' => 1, 'in progress' => 1, + 'planned' => 1, 'action scheduled' => 1, 'fixed' => 1, 'fixed - council' => 1, @@ -283,7 +283,6 @@ sub all_states { 'partial' => 1, 'unconfirmed' => 1, 'confirmed' => 1, - 'planned' => 1, 'investigating' => 1, 'in progress' => 1, 'action scheduled' => 1, @@ -311,10 +310,9 @@ HASHREF. sub council_states { my $states = { 'confirmed' => 1, - 'planned' => 1, 'investigating' => 1, - 'in progress' => 1, 'action scheduled' => 1, + 'in progress' => 1, 'fixed - council' => 1, 'unable to fix' => 1, 'not responsible' => 1, |