diff options
| author | Struan Donald <struan@exo.org.uk> | 2013-01-16 11:47:20 +0000 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2013-01-16 11:47:20 +0000 |
| commit | 682db36dca4db6c0682deeb4fb704e8cf222e38c (patch) | |
| tree | 5811b7e2288f48b0bc814f7f505e19cb705294d9 /templates/web/default/dashboard/index.html | |
| parent | 257b658e49da3665a426f1c98d9760b0d53b8d3d (diff) | |
| parent | 3c4c0ec2f55d82502169d2313745920850efdc99 (diff) | |
Merge branch 'bromley-new-statuses'
Conflicts:
bin/send-comments
conf/crontab.ugly
db/schema.sql
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/DB/Result/Open311conf.pm
perllib/FixMyStreet/DB/ResultSet/Problem.pm
perllib/Open311.pm
t/app/controller/report_updates.t
t/open311.t
templates/web/default/report/display.html
templates/web/default/report/updates.html
templates/web/fixmystreet/report/display.html
Diffstat (limited to 'templates/web/default/dashboard/index.html')
| -rw-r--r-- | templates/web/default/dashboard/index.html | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/templates/web/default/dashboard/index.html b/templates/web/default/dashboard/index.html index 169d7d3fe..f5a3cfba3 100644 --- a/templates/web/default/dashboard/index.html +++ b/templates/web/default/dashboard/index.html @@ -81,7 +81,7 @@ [% rows = { '0' => [ "in progress", "Council has marked as in progress" ] - '1' => [ "planned", "Council has marked as planned" ] + '1' => [ "action scheduled", "Council has marked as planned" ] '2' => [ "investigating", "Council has marked as investigating" ] '3' => [ "closed", "Council has marked as closed" ] }; @@ -98,10 +98,14 @@ <tr class='subtotal' id="marked"> <th scope="row">Total marked</th> - <td>[% problems.wtd.${"in progress"} + problems.wtd.planned + problems.wtd.investigating + problems.wtd.closed %]</td> - <td>[% problems.week.${"in progress"} + problems.week.planned + problems.week.investigating + problems.wtd.closed %]</td> - <td>[% problems.weeks.${"in progress"} + problems.weeks.planned + problems.weeks.investigating + problems.wtd.closed %]</td> - <td>[% problems.ytd.${"in progress"} + problems.ytd.planned + problems.ytd.investigating + problems.wtd.closed %]</td> + <td>[% problems.wtd.${"in progress"} + problems.wtd.${"action scheduled"} + + problems.wtd.investigating + problems.wtd.closed %]</td> + <td>[% problems.week.${"in progress"} + problems.week.${"action scheduled"} + + problems.week.investigating + problems.wtd.closed %]</td> + <td>[% problems.weeks.${"in progress"} + problems.weeks.${"action scheduled"} + + problems.weeks.investigating + problems.wtd.closed %]</td> + <td>[% problems.ytd.${"in progress"} + problems.ytd.${"action scheduled"} + + problems.ytd.investigating + problems.wtd.closed %]</td> </tr> <tr id="avg_fixed"> @@ -136,7 +140,7 @@ <p>Report state: <select name="state"> <option value=''>All</option> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', - loc('Investigating')], ['planned', loc('Planned')], ['in progress', + loc('Investigating')], ['action scheduled', loc('Planned')], ['in progress', loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] <option [% 'selected ' IF state.0 == q_state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] |