diff options
| author | Chris Mytton <self@hecticjeff.net> | 2013-09-13 12:12:14 +0100 |
|---|---|---|
| committer | Chris Mytton <self@hecticjeff.net> | 2013-09-13 12:12:14 +0100 |
| commit | b44f9edab53f59fb442e5ee4db28cb25408c652c (patch) | |
| tree | e7cd62bd148a5332e1ec625dda6c3bc6b09ceb62 /templates/web/default/report | |
| parent | 2099ac31a4410f2cf8e1c7d31dc35cdd9ac1e070 (diff) | |
| parent | 94ac7786132a538a5742ba325eb7fe9eff89cfc9 (diff) | |
Merge branch 'master' into oxfordshire-usability-recommendations
Diffstat (limited to 'templates/web/default/report')
| -rw-r--r-- | templates/web/default/report/updates.html | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index 83f746d56..9134c34f8 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -23,21 +23,42 @@ [%- ELSE %] [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_dt( update.confirmed ) ) | html -%] [%- END -%] + [%- update_state = '' %] - [%- IF update.mark_fixed %][% update_state = ", " _ loc( 'marked as fixed' ) %][% END %] - [%- IF update.mark_open %][% update_state = ", " _ loc( 'reopened' ) %][% END %] + [%- IF update.mark_fixed %][% update_state = loc( 'marked as fixed' ) %][% END %] + [%- IF update.mark_open %][% update_state = loc( 'reopened' ) %][% END %] [%- IF !update_state && update.problem_state %] [%- state = update.meta_problem_state %] [%- IF c.cobrand.moniker == 'bromley' OR problem.bodies_str == '2482' %] - [%- SET state = loc('no further action') IF update.problem_state == 'unable to fix' %] - [%- SET state = loc('third party responsibility') IF update.problem_state == 'not responsible' %] + [%- update_state = 'marked as no further action' IF state == 'unable to fix' %] + [%- update_state = 'marked as third party responsibility' IF state == 'not responsible' %] [%- END %] - [%- IF update.problem_state == 'confirmed' AND global.last_state != '' %] - [%- update_state = ", " _ loc('reopened') %] - [%- ELSIF update.problem_state != 'confirmed' %] - [%- update_state = ", " _ tprintf(loc( 'marked as %s' ), state ) %] + [%- END %] + [%- IF !update_state && update.problem_state %] + [%- IF state == 'confirmed' AND global.last_state != '' %] + [%- update_state = loc( 'reopened' ) %] + [%- ELSIF state == 'investigating' %] + [%- update_state = loc( 'marked as investigating' ) %] + [%- ELSIF state == 'planned' %] + [%- update_state = loc( 'marked as planned' ) %] + [%- ELSIF state == 'in progress' %] + [%- update_state = loc( 'marked as in progress' ) %] + [%- ELSIF state == 'action scheduled' %] + [%- update_state = loc( 'marked as action scheduled' ) %] + [%- ELSIF state == 'closed' %] + [%- update_state = loc( 'marked as closed' ) %] + [%- ELSIF state == 'fixed' %] + [%- update_state = loc( 'marked as fixed' ) %] + [%- ELSIF state == 'unable to fix' %] + [%- update_state = loc( 'marked as unable to fix' ) %] + [%- ELSIF state == 'not responsible' %] + [%- update_state = loc( "marked as not the council's responsibility" ) %] + [%- ELSIF state == 'duplicate' %] + [%- update_state = loc( 'marked as a duplicate report' ) %] + [%- ELSIF state == 'internal referral' %] + [%- update_state = loc( 'marked as an internal referral' ) %] [%- END %] [%- END %] - [%- update_state IF update_state != global.last_state %] + [%- ", " _ update_state IF update_state != global.last_state %] [%- global.last_state = update_state %] [% END %] |