diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/info_request.rb | 4 | ||||
| -rw-r--r-- | app/views/request/_followup.rhtml | 32 | ||||
| -rw-r--r-- | app/views/request/show.rhtml | 15 |
3 files changed, 24 insertions, 27 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 5b0140348..fae8441db 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -729,9 +729,9 @@ public elsif status == 'waiting_response' "Awaiting response." elsif status == 'waiting_response_overdue' - "Response delayed." + "Delayed." elsif status == 'waiting_response_very_overdue' - "Response overdue." + "Long overdue." elsif status == 'not_held' "Information not held." elsif status == 'rejected' diff --git a/app/views/request/_followup.rhtml b/app/views/request/_followup.rhtml index f18dd32f3..b375befd1 100644 --- a/app/views/request/_followup.rhtml +++ b/app/views/request/_followup.rhtml @@ -31,25 +31,25 @@ request '<%= request_link(@info_request) %>'. If you would like to ask for information that was not in your original request, then <%= link_to "file a new request", new_request_to_body_url(:public_body_id => @info_request.public_body.id.to_s) %>. + </p> - <% if @info_request.calculate_status == 'waiting_response_overdue' || @info_request.calculate_status == 'waiting_response_very_overdue' %> - <p> - <% if @info_request.calculate_status == 'waiting_response_very_overdue' %> - This request is <strong>long overdue a response</strong>. - <% else %> - This request is <strong>overdue a response</strong>. - <% end %> - You can say that, by law, the authority should have answered - <strong>promptly</strong>. If they have not given you a legal - reason why they need extra time - (<%= link_to "more details", about_url + "#quickly_response" %>), then - you can say they are breaking the law to have not replied by - <strong><%= simple_date(@info_request.date_response_required_by) %></strong>. + <% status = @info_request.calculate_status %> + <% if status == 'waiting_response_overdue' %> + <p>The response to your request has been <strong>delayed</strong>. You can say that, + by law, the authority should normally have responded + <strong>promptly</strong> and <% if @info_request.public_body.is_school? %> - This is a school, so legally they get lots of extra slack if it is - holiday time. + in term time <% end %> - </p> + by <strong><%= simple_date(@info_request.date_response_required_by) %></strong> + (<%= link_to "details", about_url + "#quickly_response" %>). + </p> + <% elsif status == 'waiting_response_very_overdue' %> + <p> + The response to your request is <strong>long overdue</strong>. You can say that, by + law, under all circumstances, the authority should have responded + by now (<%= link_to "details", about_url + "#quickly_response" %>). + </p> <% end %> <% form_for(:outgoing_message, @outgoing_message, :html => { :id => 'followup_form' }, :url => incoming_message.nil? ? show_response_no_followup_url(:id => @info_request.id) : show_response_url(:id => @info_request.id, :incoming_message_id => incoming_message.id)) do |o| %> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index e6e1fbcd1..28cde61ba 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -66,20 +66,17 @@ (<%= link_to "details", about_url + "#quickly_response" %>). <% elsif @status == 'waiting_response_overdue' %> Response to this request is <strong>delayed</strong>. - By law, <%= public_body_link(@info_request.public_body) %> + By law, <%= public_body_link(@info_request.public_body) %> should + normally have responded <strong>promptly</strong> and <% if @info_request.public_body.is_school? %> - in term time should - <% else %> - should normally + in term time <% end %> - have responded by - <strong><%= simple_date(@info_request.date_response_required_by) %></strong> + by <strong><%= simple_date(@info_request.date_response_required_by) %></strong> (<%= link_to "details", about_url + "#quickly_response" %>). <% elsif @status == 'waiting_response_very_overdue' %> - Response to this request is <strong>overdue</strong>. + Response to this request is <strong>long overdue</strong>. By law, under all circumstances, <%= public_body_link(@info_request.public_body) %> - should have responded by - <%= simple_date(@info_request.date_very_overdue_after) %> + should have responded by now (<%= link_to "details", about_url + "#quickly_response" %>). You can <strong>complain</strong> by <%= link_to "requesting an internal review", show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "?internal_review=1#followup" %>. |