Merge pull request #2689 from IFRCGo/feature/eap-feedbacks

Author: susilnem

api/migrations/0228_merge_20260123_0806.py

@@ -1,11 +1,11 @@
-# Generated by Django 4.2.26 on 2026-01-14 08:51
+# Generated by Django 4.2.30 on 2026-04-16 08:35
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("api", "0226_nsdinitiativescategory_and_more"),
+        ("api", "0230_alter_districtgeoms_district"),
     ]
 
     operations = [

…rations/0227_alter_export_export_type.py …rations/0231_alter_export_export_type.pyapi/migrations/0227_alter_export_export_type.py renamed to api/migrations/0231_alter_export_export_type.py api/migrations/0227_alter_export_export_type.py renamed to api/migrations/0231_alter_export_export_type.py

@@ -14,6 +14,11 @@
 @admin.register(EAPFile)
 class EAPFileAdmin(admin.ModelAdmin):
     search_fields = ("caption",)
+    list_select_related = True
+    autocomplete_fields = (
+        "created_by",
+        "modified_by",
+    )
 
 
 @admin.register(EAPRegistration)
@@ -85,12 +90,13 @@ class SimplifiedEAPAdmin(admin.ModelAdmin):
         "eap_registration__country__name",
         "eap_registration__disaster_type__name",
     )
-    list_display = ("simplifed_eap_application", "version", "is_locked")
+    list_display = ("simplifed_eap_application", "eap_registration", "version", "is_locked")
     autocomplete_fields = (
         "eap_registration",
         "created_by",
         "modified_by",
         "admin2",
+        "partners",
     )
     readonly_fields = (
         "cover_image",
@@ -159,6 +165,7 @@ def get_queryset(self, request):
             )
             .prefetch_related(
                 "admin2",
+                "partners",
                 "partner_contacts",
             )
         )
@@ -176,12 +183,13 @@ class FullEAPAdmin(admin.ModelAdmin):
         "eap_registration__country__name",
         "eap_registration__disaster_type__name",
     )
-    list_display = ("eap_registration",)
+    list_display = ("full_eap_application", "eap_registration", "version", "is_locked")
     autocomplete_fields = (
         "eap_registration",
         "created_by",
         "modified_by",
         "admin2",
+        "partners",
     )
     readonly_fields = (
         "partner_contacts",
@@ -244,6 +252,9 @@ def regenerate_diff_pdf_file(self, request, queryset):
 
     regenerate_diff_pdf_file.short_description = "Regenerate EAP diff PDF files for selected Full EAPs"
 
+    def full_eap_application(self, obj):
+        return f"{obj.eap_registration.national_society.society_name} - {obj.eap_registration.disaster_type.name}"
+
     def get_queryset(self, request):
         return (
             super()
@@ -258,6 +269,7 @@ def get_queryset(self, request):
             )
             .prefetch_related(
                 "admin2",
+                "partners",
                 "partner_contacts",
                 "key_actors",
                 "risk_analysis_source_of_information",

assets

@@ -138,7 +138,6 @@ class Meta:
 
     approach = fuzzy.FuzzyChoice(EnablingApproach.Approach)
     budget_per_approach = fuzzy.FuzzyInteger(1000, 1000000)
-    ap_code = fuzzy.FuzzyInteger(100, 999)
 
     @factory.post_generation
     def readiness_activities(self, create, extracted, **kwargs):
@@ -175,7 +174,6 @@ class Meta:
     sector = fuzzy.FuzzyChoice(PlannedOperation.Sector)
     people_targeted = fuzzy.FuzzyInteger(100, 100000)
     budget_per_sector = fuzzy.FuzzyInteger(1000, 1000000)
-    ap_code = fuzzy.FuzzyInteger(100, 999)
 
     @factory.post_generation
     def readiness_activities(self, create, extracted, **kwargs):