Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#1822] Add template for immigration correspondence (ATAS) #1823

Closed
wants to merge 3 commits into from

Conversation

mdeuk
Copy link
Collaborator

@mdeuk mdeuk commented Jan 19, 2024

Relevant issue(s)

Fixes #1822
Depends on mysociety/alaveteli#8121

What does this do?

This adds a new template Immigration correspondence (ATAS) which displays on requests made to body 93723 (FCDO).

Why was this needed?

There has been an uptick in requests to the FCDO which concern a specific immigration matter (ATAS), and this is not covered by the existing messages for this body.

Implementation notes

Nothing special to note.

Screenshots

Notes to reviewer

When testing this on a sandbox, I'm getting a weird glitch where it looks like every line is double spaced (e.g. \n\n). I think this is a problem with my environment, as it does the same with others (e.g. _subject_access_request), but it seemed worth noting anyway.

@mdeuk
Copy link
Collaborator Author

mdeuk commented Jan 19, 2024

Sorry, looks like my base was out of date - despite git originally claiming otherwise. Hopefully I've not broken anything.

@gbp
Copy link
Member

gbp commented Feb 5, 2024

Screenshot:

Admin
image

Request after being hidden
image

Email
image

Copy link
Member

@gbp gbp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great. I have created mysociety/alaveteli#8121 so we can use conditionals to render different content for prominence reason.

Once that is merged, I'll commit/merge, and deploy:

diff --git a/lib/views/admin_request/hidden_user_explanation/_immigration_correspondence_atas.text.erb b/lib/views/admin_request/hidden_user_explanation/_immigration_correspondence_atas.text.erb
index a987341..2d5fb24 100644
--- a/lib/views/admin_request/hidden_user_explanation/_immigration_correspondence_atas.text.erb
+++ b/lib/views/admin_request/hidden_user_explanation/_immigration_correspondence_atas.text.erb
@@ -2,12 +2,13 @@
       'circumstances, via our service, and we have therefore hidden it ' \
       'from other users.') %>
 
-<%= _('👉 Getting the help you need' \
+<% if explanation %>
+<%= _('👉 Getting the help you need ' \
       '{{site_name}} is an independent website which helps people make ' \
       'Freedom of Information requests in public. We are not part of the ' \
       'Government.',
       site_name: site_name) %>
-      
+
 <%= _('You should contact the Foreign, Commonwealth, and Development Office '\
       '(FCDO) directly. They are the department responsible for the ATAS '\
       'scheme. ') %>
@@ -48,4 +49,5 @@ https://www.citizensadvice.org.uk/about-us/contact-us/contact-us/contact-us/
       'to misuse our service, we wanted to remind you of our house rules, '\
       'which are the conditions of use for our service.'\
       'You can find them at: {{help_house_rules}}',
-      help_house_rules: help_house_rules_url) %>
\ No newline at end of file
+      help_house_rules: help_house_rules_url) %>
+<% end %>

@gbp gbp self-assigned this Feb 5, 2024
@WilliamWDTK
Copy link
Collaborator

WilliamWDTK commented Feb 5, 2024

There are a few textual changes I would make, referencing the parts marked in red in the image above (and text just by that section).

  1. circumstances, viacircumstances via
  2. needWhatDoTheyKnow: add line-break
  3. Foreign, Commonwealth, and Development Office → at least Foreign, Commonwealth and Development Office, but ideally match official name and WDTK listing with Foreign, Commonwealth & Development Office
  4. directly, at: atas@fcdo.gov.uk: might want to remove colon, and add a full stop at the end of the line, that's possibly personal preference.
  5. MPs offices can ask the FCDOMPs' offices can ask the FCDO
  6. You will still be able to view it while logged in to the site.You will still be able to view the request while logged into the site. (The mention of hiding was much earlier, so it's not clear what it is referring to, also in tointo.)

@gbp
Copy link
Member

gbp commented Feb 9, 2024

Thanks @WilliamWDTK I have made those changes (except for 6 as that requires a change in core Alaveteli codebase)

Updated screenshots:

Screenshot 2024-02-09 at 11-57-15 FOI request – Test request - WhatDoTheyKnow admin
Screenshot 2024-02-09 at 11 58 25
Screenshot 2024-02-09 at 11 59 19
Screenshot 2024-02-09 at 11 59 45

@gbp
Copy link
Member

gbp commented Feb 9, 2024

Merged in 56d2d5b

@gbp gbp closed this Feb 9, 2024
@garethrees garethrees changed the title [#1822] Add template for ATAS correspondence [#1822] Add template for immigration correspondence (ATAS) Apr 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Provide canned removal message for ATAS
3 participants