diff options
Diffstat (limited to 'app/views/request')
| -rw-r--r-- | app/views/request/_followup.rhtml | 25 | ||||
| -rw-r--r-- | app/views/request/show.rhtml | 27 |
2 files changed, 35 insertions, 17 deletions
diff --git a/app/views/request/_followup.rhtml b/app/views/request/_followup.rhtml index 5c07b1b67..4e78ce8f7 100644 --- a/app/views/request/_followup.rhtml +++ b/app/views/request/_followup.rhtml @@ -37,14 +37,23 @@ <% end %> <% if @info_request.calculate_status == 'waiting_response_overdue' %> - <p>This request is currently <strong>overdue a response</strong> from <%= - public_body_link(@info_request.public_body) %>. - By law, the response had to be prompt but no later than - <strong><%= simple_date(@info_request.date_response_required_by) %></strong> - (<%= link_to "more info", about_url + "#quickly_response" %>). You can say - that under the <%=h(@info_request.law_used_act)%> they should have replied by now, - and are breaking the law. - </p> + <p> + <% if @info_request.working_days_20_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>. + <% if @info_request.public_body.is_school? %> + This is a school, so legally they get lots of extra slack if it is + holiday time. + <% end %> + </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 f3bc03688..5b89a6d12 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -59,16 +59,25 @@ they <%= link_to "must respond", about_url + "#quickly_response" %> promptly but no later than <strong><%= simple_date(@info_request.date_response_required_by) %></strong>. <% elsif @status == 'waiting_response_overdue' %> - Currently <strong>overdue a response</strong> from <%= - public_body_link(@info_request.public_body) %>. By law, - the response had to be prompt but - <%= link_to "no later", about_url + "#quickly_response" %> - than <strong><%= simple_date(@info_request.date_response_required_by) %></strong>. - - <% if @info_request.days_overdue > 14 %> - They are <%= @info_request.days_overdue.to_i %> days late, you - can <strong>complain</strong> by + <% if @info_request.working_days_20_overdue? %> + This request is <strong>long overdue a response</strong>. + By law, <%= public_body_link(@info_request.public_body) %> + should normally have answered by + <strong><%= simple_date(@info_request.date_response_required_by) %></strong> + (<%= link_to "more 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" %>. + <% else %> + This request is <strong>overdue a response</strong>. + By law, <%= public_body_link(@info_request.public_body) %> + should normally have answered by + <strong><%= simple_date(@info_request.date_response_required_by) %></strong>. + If they need extra time they should have told you + why (<%= link_to "more details", about_url + "#quickly_response" %>). + <% end %> + <% if @info_request.public_body.is_school? %> + This is a school, so legally they get lots of extra slack if it is + holiday time. <% end %> <% elsif @status == 'not_held' %> |