Permalink
Browse files

More correct front-end display of Zurich status mappings.

  • Loading branch information...
1 parent 2551905 commit 05a1e0a43c3fbf70dbb85eace1216bac0e7f539e @dracos dracos committed Dec 21, 2012
View
2 notes/states.txt
@@ -22,7 +22,7 @@ the problem has been reported to:
Open ( a synonym for confirmed )
Investigating
Planned
- In Progress
+ In progress
Fixed
Closed
View
2 templates/web/bromley/report/display.html
@@ -79,7 +79,7 @@
<select name="state" id="form_state">
[% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
loc('Investigating')], ['planned', loc('Planned')], ['in progress',
- loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %]
+ loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %]
<option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option>
[% END %]
</select>
View
2 templates/web/default/admin/report_edit.html
@@ -18,7 +18,7 @@
<li><label class="inline" for="state">[% loc('State:') %]</label> <select name="state" id="state">
[% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
loc('Investigating')], ['planned', loc('Planned')], ['in progress',
- loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')], ['fixed - user',
+ loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')], ['fixed - user',
loc('Fixed - User')], ['fixed - council', loc('Fixed - Council')], ['hidden', loc('Hidden')], ['partial', loc('Partial')],['unconfirmed',loc('Unconfirmed')] ] %]
<option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option>
[% END %]
View
2 templates/web/default/dashboard/index.html
@@ -137,7 +137,7 @@
<option value=''>All</option>
[% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
loc('Investigating')], ['planned', loc('Planned')], ['in progress',
- loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %]
+ loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %]
<option [% 'selected ' IF state.0 == q_state %] value="[% state.0 %]">[% state.1 %]</option>
[% END %]
</select>
View
2 templates/web/default/report/update-form.html
@@ -29,7 +29,7 @@
<select name="state" id="form_state">
[% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
loc('Investigating')], ['planned', loc('Planned')], ['in progress',
- loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %]
+ loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %]
<option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option>
[% END %]
</select>
View
2 templates/web/fixmystreet/report/update-form.html
@@ -27,7 +27,7 @@
<select name="state" id="form_state">
[% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
loc('Investigating')], ['planned', loc('Planned')], ['in progress',
- loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %]
+ loc('In progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %]
<option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option>
[% END %]
</select>
View
2 templates/web/zurich/admin/report_edit.html
@@ -26,7 +26,7 @@
[% FOREACH state IN [
['unconfirmed',loc('Submitted')]
['confirmed', loc('Open')],
- ['in progress', loc('In Progress')],
+ ['in progress', loc('In progress')],
['fixed - council', loc('Fixed')],
['hidden', loc('Hidden')],
['closed', loc('Third party')],
View
20 templates/web/zurich/report/banner.html
@@ -0,0 +1,20 @@
+[% USE date %]
+[% BLOCK banner %]
+ <div class="banner">
+ <p id="[% id %]">[% text %]</p>
+ </div>
+[% END %]
+
+[% IF problem.is_fixed %]
+ [% INCLUDE banner, id = 'fixed', text = loc('Fixed') %]
+[% END %]
+[% IF problem.is_closed %]
+ [% INCLUDE banner, id = 'closed', text = loc('Third party') %]
+[% END %]
+[% IF problem.state == 'unconfirmed' %]
+ [% INCLUDE banner, id = 'closed', text = loc('Submitted') %]
+[% END %]
+[% IF problem.state == 'in progress' %]
+ [% INCLUDE banner, id = 'progress', text = loc('In progress') %]
+[% END %]
+

0 comments on commit 05a1e0a

Please sign in to comment.