Update changelog. Fix DREF email templates

CHANGELOG.md

@@ -7,12 +7,39 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## Unreleased
 
 ### Added
+ - EAP: add RCRC Climate Centre to registration and lift activity limit
+ - Use APP_subtype instead of APD_TYP_Id in ingest_appeals
+ - DREF: add automated DREF Final Report alert emails and cron job
+ - DREF: update DREF budget template to 2025.08.19 version
+ - Add DREF email variables
+ - Use IFRC GO instead of IFRC Go + a startdate fix
+ - Change guest user approval process
+ - Fix regions and accented countries in query results
+ - DREF: implement per-section summary
+ - Pin exact appeal-code/GLIDE matches above fuzzy ES matches
+ - Hide predefined_search_urls and their tests
+ - Docker: replace entrypoint with dev run script
+ - Add predefined general/country-specific search keys/urls
+ - EAP: use one permission check for both submit-for-review transitions
+ - Aggregate: allowlist filter_*/sum_* query params
+ - Add some ERP-side disaster types to dtype_map
+ - Fix ingest_appeals: apply the new upsteam API fields
+ - Give only open surge alerts as HayStackSearch result
+ - Use SurgeAlertStatus text instead of numbers
+ - Fix timezone issue in AppealAdmin
+ - Create AppealHistory savepoint when amount_funded changes
+ - Add appeals_cut_from_history count to Brief
+ - Derive numeric aid from APP_code and scope AppealHistory updates by appeal
+ - Restrict EAP visibility to the owning National Society
+ - Fix some more GlobalEnumView language issues in PER
+ - ingest_appeals: handle null sector/country from upstream API
+ - PER-dashboard: expand dashboard data contract, fix National Society fixture
+ - Bilaterals are no longer used in Appeals
+ - Docker: build on Debian Trixie
+ - Fix sync_molnix and ingest_appeals jobs
  - Remove nginx, wait-for-it and the unused `main/runserver.sh` from the image
- - Upgrade django-health-check to 4.x; a disk/memory threshold breach now fails
-   `/health-check/`
- - Squash all app migrations (745 files to 14) using `replaces`; the replaced
-   files are deleted in a follow-up release, which must not be deployed until
-   this one is applied everywhere
+ - Upgrade django-health-check to 4.x
+ - Squash all app migrations (745 files to 14) using `replaces`
  - Fix sentry N+1 issues
  - Use Don_Code for country identification in ingest_ns_directory job
  - Skip for empty email on notification

dref/tasks.py

@@ -79,7 +79,7 @@ def send_final_report_implementation_end_email(dref_id: int):
 
     to_emails, cc_emails = get_final_report_alert_recipients(instance)
     email_context = get_final_report_alert_email_context(instance)
-    email_subject = f"DREF Final Report required – {instance.appeal_code}"
+    email_subject = f"DREF Final Report Required – {instance.appeal_code}"
     email_body = render_to_string("email/dref/final_report_implementation_end.html", email_context)
     send_notification_dref(
         subject=email_subject,
@@ -101,7 +101,7 @@ def send_final_report_reminder_email(dref_id: int):
 
     to_emails, cc_emails = get_final_report_alert_recipients(instance)
     email_context = get_final_report_alert_email_context(instance)
-    email_subject = f"Reminder: DREF Final Report due in 1 month – {instance.appeal_code}"
+    email_subject = f"Reminder: DREF Final Report Due in 1 Month – {instance.appeal_code}"
     email_body = render_to_string("email/dref/final_report_reminder.html", email_context)
     send_notification_dref(
         subject=email_subject,
@@ -123,7 +123,7 @@ def send_final_report_overdue_email(dref_id: int):
 
     to_emails, cc_emails = get_final_report_alert_recipients(instance)
     email_context = get_final_report_alert_email_context(instance)
-    email_subject = f"Action Required: Overdue DREF Final Report – {instance.appeal_code}"
+    email_subject = f"DREF Final Report Overdue – {instance.appeal_code}"
     email_body = render_to_string("email/dref/final_report_overdue.html", email_context)
     send_notification_dref(
         subject=email_subject,
@@ -148,7 +148,7 @@ def send_final_report_recurring_overdue_email(dref_id: int):
 
     to_emails, cc_emails = get_final_report_alert_recipients(instance)
     email_context = get_final_report_alert_email_context(instance)
-    email_subject = f"Reminder: DREF Final Report remains overdue – {instance.appeal_code}"
+    email_subject = f"DREF Final Report Remains Overdue – {instance.appeal_code}"
     email_body = render_to_string("email/dref/final_report_recurring_overdue.html", email_context)
     send_notification_dref(
         subject=email_subject,

notifications/templates/email/dref/final_report_implementation_end.html

@@ -4,15 +4,26 @@
      <tr>
        <td align="center" class="pb-30" style="padding-bottom:30px;">
          <p>Dear Colleague,</p>
+         <br>
          <p>
            The implementation timeframe for DREF operation <b>{{ mdr_code }}</b> – <b>{{ operation_name }}</b>
            ended on <b>{{ operation_end_date|date:"d M Y" }}</b>.
          </p>
          <p>
-           In line with DREF reporting requirements, a final narrative and financial report is due by
+           In line with DREF reporting requirements, a final narrative and financial report approval is due by
            <b>{{ due_date|date:"d M Y" }}</b>.
          </p>
          <p>Please initiate the necessary steps to prepare and submit the report by the deadline.</p>
+         <p>
+           If you have any questions regarding reporting requirements, deadlines, or the status of this
+           operation, please contact your IFRC DREF Regional Focal Point.
+         </p>
+         <br>
+         <p>
+           This is an automatically generated email. You are receiving this notification because your contact
+           information has been recorded as one of the main contacts for this operation in IFRC GO.
+         </p>
+         <br>
          <p>Kind regards,<br>DREF Team</p>
        </td>
      </tr>

notifications/templates/email/dref/final_report_overdue.html

@@ -4,15 +4,26 @@
      <tr>
        <td align="center" class="pb-30" style="padding-bottom:30px;">
          <p>Dear Colleague,</p>
+         <br>
          <p>
-           The final narrative and financial report for DREF operation <b>{{ mdr_code }}</b> –
+           The final narrative and financial report approval for DREF operation <b>{{ mdr_code }}</b> –
            <b>{{ operation_name }}</b> was due on <b>{{ due_date|date:"d M Y" }}</b> and has not yet been submitted.
          </p>
          <p>
            Timely submission of final reports is an important DREF requirement and helps ensure our
            accountability to donors and stakeholders.
          </p>
          <p>Please prioritize the completion and submission of the report as soon as possible.</p>
+         <p>
+           If you have any questions regarding reporting requirements, deadlines, or the status of this
+           operation, please contact your IFRC DREF Regional Focal Point.
+         </p>
+         <br>
+         <p>
+           This is an automatically generated email. You are receiving this notification because your contact
+           information has been recorded as one of the main contacts for this operation in IFRC GO.
+         </p>
+         <br>
          <p>Kind regards,<br>DREF Team</p>
        </td>
      </tr>

notifications/templates/email/dref/final_report_recurring_overdue.html

@@ -4,11 +4,22 @@
      <tr>
        <td align="center" class="pb-30" style="padding-bottom:30px;">
          <p>Dear Colleague,</p>
+         <br>
          <p>
-           This is a reminder that the final narrative and financial report for DREF operation
+           This is a reminder that the final narrative and financial report approval for DREF operation
            <b>{{ mdr_code }}</b> – <b>{{ operation_name }}</b> remains overdue.
          </p>
          <p>The report was due on <b>{{ due_date|date:"d M Y" }}</b>. Please submit the final report as soon as possible.</p>
+         <p>
+           If you have any questions regarding reporting requirements, deadlines, or the status of this
+           operation, please contact your IFRC DREF Regional Focal Point.
+         </p>
+         <br>
+         <p>
+           This is an automatically generated email. You are receiving this notification because your contact
+           information has been recorded as one of the main contacts for this operation in IFRC GO.
+         </p>
+         <br>
          <p>Kind regards,<br>DREF Team</p>
        </td>
      </tr>

notifications/templates/email/dref/final_report_reminder.html

@@ -4,15 +4,26 @@
      <tr>
        <td align="center" class="pb-30" style="padding-bottom:30px;">
          <p>Dear Colleague,</p>
+         <br>
          <p>
-           This is a reminder that the final narrative and financial report for DREF operation
+           This is a reminder that the final narrative and financial report approval for DREF operation
            <b>{{ mdr_code }}</b> – <b>{{ operation_name }}</b> is due on <b>{{ due_date|date:"d M Y" }}</b>.
          </p>
          <p>
            The implementation timeframe ended on <b>{{ operation_end_date|date:"d M Y" }}</b>, and 1 month
            remains until the report submission deadline.
          </p>
          <p>If work on the report has already started, please ensure it is finalized and submitted by the due date.</p>
+         <p>
+           If you have any questions regarding reporting requirements, deadlines, or the status of this
+           operation, please contact your IFRC DREF Regional Focal Point.
+         </p>
+         <br>
+         <p>
+           This is an automatically generated email. You are receiving this notification because your contact
+           information has been recorded as one of the main contacts for this operation in IFRC GO.
+         </p>
+         <br>
          <p>Kind regards,<br>DREF Team</p>
        </td>
      </tr>