Merge pull request #2537 from IFRCGo/fix/rename-ifrc-staff-to-eru

fix(field-report): rename ifrc staff to emergency response unit

Author: szabozoltan69

api/drf_views.py

@@ -1127,7 +1127,7 @@ class SupportedActivityViewset(viewsets.ReadOnlyModelViewSet):
 #             "appeal",
 #             "rdrt",
 #             "fact",
-#             "ifrc_staff",
+#             "emergency_response_unit",
 #             "imminent_dref",
 #             "forecast_based_action",
 #             "eru_base_camp",

api/factories/field_report.py

@@ -111,8 +111,8 @@ class Meta:
     num_rdrt = fuzzy.FuzzyInteger(0, 9)
     fact = fuzzy.FuzzyChoice(models.RequestChoices)
     num_fact = fuzzy.FuzzyInteger(0, 9)
-    ifrc_staff = fuzzy.FuzzyChoice(models.RequestChoices)
-    num_ifrc_staff = fuzzy.FuzzyInteger(0, 9)
+    emergency_response_unit = fuzzy.FuzzyChoice(models.RequestChoices)
+    num_emergency_response_unit = fuzzy.FuzzyInteger(0, 9)
 
     # ERU units
     eru_base_camp = fuzzy.FuzzyChoice(models.RequestChoices)

api/management/commands/index_and_notify.py

@@ -611,12 +611,12 @@ def construct_template_record(self, rtype, record):
                     # not used: 'gov_num_potentially_affected': record.gov_num_potentially_affected,
                     # not used: 'health_min_num_assisted': record.health_min_num_assisted,
                     # not used: 'who_num_assisted': record.who_num_assisted,
-                    # not used: 'ifrc_staff': record.ifrc_staff, !get_..._display!
+                    # not used: 'emergency_response_unit': record.emergency_response_unit, !get_..._display!
                     # not used: 'is_covid_report': record.is_covid_report,
                     # not used: 'num_expats_delegates': record.num_expats_delegates,
                     # not used: 'num_fact': record.num_fact,
                     # not used: 'num_highest_risk': record.num_highest_risk,
-                    # not used: 'num_ifrc_staff': record.num_ifrc_staff,
+                    # not used: 'num_emergency_response_unit': record.num_emergency_response_unit,
                     # not used: 'num_localstaff': record.num_localstaff,
                     # not used: 'num_potentially_affected': record.num_potentially_affected,
                     # not used: 'rdrt': record.rdrt, !get_..._display!

api/migrations/0222_rename_ifrc_staff_fieldreport_emergency_response_unit_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.19 on 2025-08-19 10:24
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("api", "0221_alter_nsdinitiatives_unique_together_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="fieldreport",
+            old_name="ifrc_staff",
+            new_name="emergency_response_unit",
+        ),
+        migrations.RenameField(
+            model_name="fieldreport",
+            old_name="num_ifrc_staff",
+            new_name="num_emergency_response_unit",
+        ),
+    ]

api/migrations/0223_alter_fieldreport_emergency_response_unit_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.19 on 2025-08-19 10:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("api", "0222_rename_ifrc_staff_fieldreport_emergency_response_unit_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="fieldreport",
+            name="emergency_response_unit",
+            field=models.IntegerField(
+                choices=[(0, "No"), (1, "Requested"), (2, "Planned"), (3, "Completed")],
+                default=0,
+                null=True,
+                verbose_name="Emergency Response Unit",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="fieldreport",
+            name="num_emergency_response_unit",
+            field=models.IntegerField(blank=True, null=True, verbose_name="Number of Emergency Response Units"),
+        ),
+    ]

api/models.py

@@ -1621,8 +1621,10 @@ class RecentAffected(models.IntegerChoices):
     num_rdrt = models.IntegerField(verbose_name=_("number of RDRT"), null=True, blank=True)
     fact = models.IntegerField(choices=RequestChoices.choices, verbose_name=_("fact"), default=0, null=True)
     num_fact = models.IntegerField(verbose_name=_("number of fact"), null=True, blank=True)
-    ifrc_staff = models.IntegerField(choices=RequestChoices.choices, verbose_name=_("IFRC staff"), default=0, null=True)
-    num_ifrc_staff = models.IntegerField(verbose_name=_("number of IFRC staff"), null=True, blank=True)
+    emergency_response_unit = models.IntegerField(
+        choices=RequestChoices.choices, verbose_name=_("Emergency Response Unit"), default=0, null=True
+    )
+    num_emergency_response_unit = models.IntegerField(verbose_name=_("Number of Emergency Response Units"), null=True, blank=True)
 
     # ERU units
     eru_base_camp = models.IntegerField(choices=RequestChoices.choices, verbose_name=_("ERU base camp"), default=0)

api/serializers.py

@@ -1954,7 +1954,7 @@ class FieldReportEnumDisplayMixin:
     forecast_based_action_display = serializers.CharField(source="get_forecast_based_action_display", read_only=True)
     rdrt_display = serializers.CharField(source="get_rdrt_display", read_only=True)
     fact_display = serializers.CharField(source="get_fact_display", read_only=True)
-    ifrc_staff_display = serializers.CharField(source="get_ifrc_staff_display", read_only=True)
+    emergency_response_unit_display = serializers.CharField(source="get_emergency_response_unit_display", read_only=True)
     eru_base_camp_display = serializers.CharField(source="get_eru_base_camp_display", read_only=True)
     eru_basic_health_care_display = serializers.CharField(source="get_eru_basic_health_care_display", read_only=True)
     eru_it_telecom_display = serializers.CharField(source="get_eru_it_telecom_display", read_only=True)
@@ -2112,7 +2112,7 @@ class FieldReportSerializer(
     forecast_based_action_display = serializers.CharField(source="get_forecast_based_action_display", read_only=True)
     rdrt_display = serializers.CharField(source="get_rdrt_display", read_only=True)
     fact_display = serializers.CharField(source="get_fact_display", read_only=True)
-    ifrc_staff_display = serializers.CharField(source="get_ifrc_staff_display", read_only=True)
+    emergency_response_unit_display = serializers.CharField(source="get_emergency_response_unit_display", read_only=True)
     eru_base_camp_display = serializers.CharField(source="get_eru_base_camp_display", read_only=True)
     eru_basic_health_care_display = serializers.CharField(source="get_eru_basic_health_care_display", read_only=True)
     eru_it_telecom_display = serializers.CharField(source="get_eru_it_telecom_display", read_only=True)

notifications/templates/design/main_field_report.html

@@ -641,13 +641,13 @@
                                       {{ fr.other_fields.num_highest_risk|floatformat:"1"|intcomma|slice:":-2" }} </td>
                               </tr>
                           {% endif %}
-                          {% if fr.other_fields.num_ifrc_staff %}
+                          {% if fr.other_fields.num_emergency_response_unit %}
                               <tr>
                                   <td align="left" style="font-weight: bold">
                                       IFRC Staff
                                   </td>
                                   <td align="left">
-                                      {{ fr.other_fields.num_ifrc_staff|floatformat:"1"|intcomma|slice:":-2" }} </td>
+                                      {{ fr.other_fields.num_emergency_response_unit|floatformat:"1"|intcomma|slice:":-2" }} </td>
                               </tr>
                           {% endif %}
                           {% if fr.other_fields.affected_pop_centres %}