-
Notifications
You must be signed in to change notification settings - Fork 10
EAP: Changes on Status and feedbacks #2799
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
Draft
susilnem
wants to merge
2
commits into
develop
Choose a base branch
from
feature/eap-feedbacks
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
105 changes: 105 additions & 0 deletions
105
eap/migrations/0006_remove_eapregistration_pending_pfa_at_and_more.py
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| # Generated by Django 5.2.14 on 2026-07-24 04:49 | ||
|
|
||
| from django.db import migrations, models | ||
| from django.db.models import F | ||
| from django.db.models.functions import Abs | ||
|
|
||
|
|
||
| def backfill_partner_from_national_society(apps, schema_editor): | ||
| """ | ||
| Preserve the old FK's name instead of dropping it once national_society is removed. | ||
| """ | ||
| KeyActor = apps.get_model("eap", "KeyActor") | ||
| for key_actor in KeyActor.objects.select_related("national_society").iterator(): | ||
| key_actor.partner = key_actor.national_society.society_name | ||
| key_actor.save(update_fields=["partner"]) | ||
|
|
||
|
|
||
| def clamp_negative_values_to_zero(apps, schema_editor): | ||
| """ | ||
| PositiveField adds a DB-level `>= 0` CHECK constraint on PostgreSQL; | ||
| existing negative rows would make the AlterField operations in the next | ||
| migration fail. | ||
| """ | ||
| PlannedOperation = apps.get_model("eap", "PlannedOperation") | ||
| SimplifiedEAP = apps.get_model("eap", "SimplifiedEAP") | ||
| FullEAP = apps.get_model("eap", "FullEAP") | ||
|
|
||
| PlannedOperation.objects.update(people_targeted=Abs(F("people_targeted")), budget_per_sector=Abs(F("budget_per_sector"))) | ||
|
|
||
| for Model in (SimplifiedEAP, FullEAP): | ||
| Model.objects.update( | ||
| people_targeted=Abs(F("people_targeted")), | ||
| total_budget=Abs(F("total_budget")), | ||
| readiness_budget=Abs(F("readiness_budget")), | ||
| pre_positioning_budget=Abs(F("pre_positioning_budget")), | ||
| early_action_budget=Abs(F("early_action_budget")), | ||
| ) | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
|
|
||
| dependencies = [ | ||
| ('eap', '0005_remove_fulleap_unique_full_eap_version_and_more'), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.RenameField( | ||
| model_name='eapregistration', | ||
| old_name='approved_at', | ||
| new_name='project_agreement_signed_at', | ||
| ), | ||
| migrations.RenameField( | ||
| model_name='eapregistration', | ||
| old_name='pending_pfa_at', | ||
| new_name='approved_at', | ||
| ), | ||
| migrations.AlterField( | ||
| model_name='eapregistration', | ||
| name='project_agreement_signed_at', | ||
| field=models.DateTimeField(blank=True, help_text='Timestamp when the project agreement was signed.', null=True, verbose_name='project agreement signed at'), | ||
| ), | ||
| migrations.AlterField( | ||
| model_name='eapregistration', | ||
| name='approved_at', | ||
| field=models.DateTimeField(blank=True, help_text='Timestamp when the EAP was approved.', null=True, verbose_name='approved at'), | ||
| ), | ||
| migrations.AddField( | ||
| model_name='keyactor', | ||
| name='partner', | ||
| field=models.CharField(default='', help_text='Name of the partner organization or entity.', max_length=255, verbose_name='Partner'), | ||
| preserve_default=False, | ||
| ), | ||
| migrations.AddField( | ||
| model_name='eapregistration', | ||
| name='disaster_sub_type', | ||
| field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Disaster Sub Type'), | ||
| ), | ||
| migrations.AddField( | ||
| model_name='fulleap', | ||
| name='include_rcrc_climate_center', | ||
| field=models.BooleanField(default=False, verbose_name='Include RCRC Climate Center.'), | ||
| ), | ||
| migrations.AddField( | ||
| model_name='simplifiedeap', | ||
| name='include_rcrc_climate_center', | ||
| field=models.BooleanField(default=False, verbose_name='Include RCRC Climate Center.'), | ||
| ), | ||
| migrations.AlterField( | ||
| model_name='eapregistration', | ||
| name='status', | ||
| field=models.IntegerField(choices=[(10, 'Under Development'), (20, 'Under Review'), (30, 'NS Addressing Comments'), (40, 'Technically validated by VC'), (50, 'Approved'), (60, 'Project Agreement Signed')], default=10, help_text='Select the current status of the EAP development process.', verbose_name='EAP Status'), | ||
| ), | ||
| migrations.AddField( | ||
| model_name='operationactivity', | ||
| name='activation_one', | ||
| field=models.BooleanField(blank=True, null=True, verbose_name='Activation 1'), | ||
| ), | ||
| migrations.AddField( | ||
| model_name='operationactivity', | ||
| name='activation_two', | ||
| field=models.BooleanField(blank=True, null=True, verbose_name='Activation 2'), | ||
| ), | ||
| migrations.RunPython(backfill_partner_from_national_society, migrations.RunPython.noop), | ||
| migrations.RunPython(clamp_negative_values_to_zero, migrations.RunPython.noop), | ||
| ] |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.