EAP: Email setup and templates #2607
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
susilnem
requested changes
Dec 9, 2025
susilnem
requested changes
Dec 10, 2025
sudip-khanal
force-pushed
the
feat/add-email-setup-and-template
branch
from
486f463 to
832c190
Compare
susilnem
requested changes
Dec 11, 2025
eap/tasks.py
Outdated
Comment on lines
33
to
37
| cc_recipients = [ | ||
| instance.national_society_contact_email, | ||
| *settings.EMAIL_EAP_DREF_AA_GLOBAL_TEAM, | ||
| *regional_coordinator_emails, | ||
| ] |
Member
There was a problem hiding this comment.
We might need unique here.
Suggested change
| cc_recipients = [ | |
| instance.national_society_contact_email, | |
| *settings.EMAIL_EAP_DREF_AA_GLOBAL_TEAM, | |
| *regional_coordinator_emails, | |
| ] | |
| cc_recipients = list( | |
| set([ | |
| instance.national_society_contact_email, | |
| *settings.EMAIL_EAP_DREF_AA_GLOBAL_TEAM, | |
| *regional_coordinator_emails, | |
| ]) | |
| ) |
eap/tasks.py
Outdated
| email_context = get_eap_registration_email_context(instance) | ||
| email_subject = f"[{instance.get_eap_type_display()} IN DEVELOPMENT] {instance.country} {instance.disaster_type}" | ||
| email_body = render_to_string("email/eap/registration.html", email_context) | ||
| email_type = "EAP-REGISTRATION" |
Member
There was a problem hiding this comment.
Suggested change
| email_type = "EAP-REGISTRATION" | |
| email_type = "New EAP Registration" |
eap/tasks.py
Outdated
| *regional_coordinator_emails, | ||
| ] | ||
| email_context = get_eap_registration_email_context(instance) | ||
| email_subject = f"[{instance.get_eap_type_display()} IN DEVELOPMENT] {instance.country} {instance.disaster_type}" |
Member
There was a problem hiding this comment.
We might need smth like this, as EAP_type can be set to null.
Suggested change
| email_subject = f"[{instance.get_eap_type_display()} IN DEVELOPMENT] {instance.country} {instance.disaster_type}" | |
| email_subject = f"[{instance.get_eap_type_display() if instance.get_eap_type_display() else 'EAP'} IN DEVELOPMENT] {instance.country} {instance.disaster_type}" | |
| </tr> | ||
| <tr> | ||
| <td style="font-weight: bold;">Type of EAP</td> | ||
| <td>{{ eap_type_display }}</td> |
eap/utils.py
Outdated
| "ns_contact_name": eap_registration_data["national_society_contact_name"], | ||
| "ns_contact_email": eap_registration_data["national_society_contact_email"], | ||
| "ns_contact_phone": eap_registration_data["national_society_contact_phone_number"], | ||
| "status_display": eap_registration_data["status_display"], |
Contributor
Author
There was a problem hiding this comment.
We need the National Society contact info for the Kind regards section of the email.
Member
There was a problem hiding this comment.
My bad, I was asking about status display.
| {{ ns_contact_phone }} | ||
| </p> | ||
| </td> | ||
| </tr> |
Member
There was a problem hiding this comment.
We might need here to redirect to frontend url..
Contributor
Author
There was a problem hiding this comment.
It’s not mentioned in the Process Emails docs, but I’ve added it.
sudip-khanal
force-pushed
the
feat/add-email-setup-and-template
branch
from
c1ac5ac to
aa730e6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Checklist
Things that should succeed before merging.
Release
If there is a version update, make sure to tag the repository with the latest version.