Skip to content

EAP: Changes on Status and feedbacks - #2799

Merged
susilnem merged 5 commits into
developfrom
feature/eap-feedbacks
Aug 12, 2026
Merged

EAP: Changes on Status and feedbacks#2799
susilnem merged 5 commits into
developfrom
feature/eap-feedbacks

Conversation

@susilnem

Copy link
Copy Markdown
Member

Changes

  • Rename EAPStatus 50/60: PENDING_PFA -> APPROVED, APPROVED -> PROJECT_AGREEMENT_SIGNED
  • Swap EAPRegistration timestamp fields to match: old approved_at ->
    project_agreement_signed_at, old pending_pfa_at -> approved_at (renamed, data preserved)
  • Replace KeyActor.national_society (FK) with a free-text partner field, backfilled from the FK's society_name
  • Add EAPRegistration.disaster_sub_type and CommonEAPFields.include_rcrc_climate_center
  • Add OperationActivity.activation_one / activation_two (prepositioning and early action activities only, not readiness)
  • Change budget/people_targeted fields (PlannedOperation, SimplifiedEAP, FullEAP) from IntegerField to PositiveIntegerField; clamp existing negative values via abs()
  • Update email templates for the renamed statuses (drop pending_pfa.html, add project_agreement_signed.html)
  • Fix serializers/admin/views left referencing the old KeyActor.national_society field
  • Update tests for the KeyActor partner rename, new activation fields, and fix a stale status-transition-email assertion left over from the status rename

Checklist

Things that should succeed before merging.

  • Updated/ran unit tests
  • Updated CHANGELOG.md

Release

If there is a version update, make sure to tag the repository with the latest version.

@susilnem
susilnem force-pushed the feature/eap-feedbacks branch 4 times, most recently from af209a9 to bd1b848 Compare July 24, 2026 11:18
@susilnem
susilnem force-pushed the feature/eap-feedbacks branch 3 times, most recently from 851203e to bb299c0 Compare July 28, 2026 09:24

@sudip-khanal sudip-khanal left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Minor changes

Comment thread eap/dev_views.py
@susilnem
susilnem force-pushed the feature/eap-feedbacks branch 3 times, most recently from 1d3c0ee to da54fd0 Compare August 5, 2026 10:57
@susilnem
susilnem force-pushed the feature/eap-feedbacks branch from da54fd0 to 293bdc8 Compare August 10, 2026 05:52
…eld types

- Rename EAPStatus 50/60: PENDING_PFA -> APPROVED, APPROVED -> PROJECT_AGREEMENT_SIGNED
- Swap EAPRegistration timestamp fields to match: old approved_at ->
project_agreement_signed_at, old pending_pfa_at -> approved_at (renamed, data preserved)
- Replace KeyActor.national_society (FK) with a free-text partner field,
backfilled from the FK's society_name
- Add EAPRegistration.disaster_sub_type and CommonEAPFields.include_rcrc_climate_center
- Add OperationActivity.activation_one / activation_two (prepositioning and
early action activities only, not readiness)
- Change budget/people_targeted fields (PlannedOperation, SimplifiedEAP, FullEAP)
from IntegerField to PositiveIntegerField; clamp existing negative values via abs()
- Update email templates for the renamed statuses (drop pending_pfa.html,
add project_agreement_signed.html)
- Fix serializers/admin/views left referencing the old KeyActor.national_society field
- Update tests for the KeyActor partner rename, new activation fields, and fix a
stale status-transition-email assertion left over from the status rename
- make lead time accept string
- update validation check for the lead time unit
- update on exisiting migration file
@susilnem
susilnem force-pushed the feature/eap-feedbacks branch from 293bdc8 to b7e559e Compare August 12, 2026 04:22
- optimise the admin panel for eap registration
@susilnem
susilnem marked this pull request as ready for review August 12, 2026 08:53
@susilnem
susilnem merged commit 3bd2e6b into develop Aug 12, 2026
7 checks passed
@susilnem
susilnem deleted the feature/eap-feedbacks branch August 12, 2026 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants