Merge pull request #1371 from IFRCGo/feature/emergency-fixes

Feature/emergency fixes

Author: szabozoltan69

api/migrations/0150_event_emergency_response_contact_email.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.27 on 2022-03-22 10:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0149_auto_20220318_0413'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='emergency_response_contact_email',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='emergency response contact email'),
+        ),
+    ]

api/models.py

@@ -595,6 +595,11 @@ class Event(models.Model):
 
     # visibility
     visibility = EnumIntegerField(VisibilityChoices, verbose_name=_('visibility'), default=1)
+    emergency_response_contact_email = models.CharField(
+        verbose_name=_('emergency response contact email'),
+        null=True, blank=True,
+        max_length=255
+    )
 
     class Meta:
         ordering = ('-disaster_start_date',)

api/serializers.py

@@ -435,15 +435,15 @@ class Meta:
 class MiniEventSerializer(ModelSerializer):
     class Meta:
         model = Event
-        fields = ('name', 'dtype', 'id', 'slug', 'parent_event',)
+        fields = ('name', 'dtype', 'id', 'slug', 'parent_event', 'emergency_response_contact_email')
 
 
 class ListMiniEventSerializer(ModelSerializer):
     dtype = DisasterTypeSerializer(read_only=True)
 
     class Meta:
         model = Event
-        fields = ('id', 'name', 'slug', 'dtype', 'auto_generated_source')
+        fields = ('id', 'name', 'slug', 'dtype', 'auto_generated_source', 'emergency_response_contact_email')
 
 
 class ListEventSerializer(EnumSupportSerializerMixin, ModelSerializer):
@@ -459,6 +459,7 @@ class Meta:
             'name', 'dtype', 'countries', 'summary', 'num_affected', 'ifrc_severity_level', 'ifrc_severity_level_display',
             'glide', 'disaster_start_date', 'created_at', 'auto_generated', 'appeals', 'is_featured', 'is_featured_region',
             'field_reports', 'updated_at', 'id', 'slug', 'parent_event', 'tab_one_title', 'tab_two_title', 'tab_three_title',
+            'emergency_response_contact_email',
         )
 
 

deployments/migrations/0058_auto_20220322_1056.py

@@ -0,0 +1,24 @@
+# Generated by Django 2.2.27 on 2022-03-22 10:56
+
+import deployments.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('deployments', '0057_merge_20220318_0527'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='emergencyprojectactivity',
+            name='has_no_data_on_people_reached',
+            field=models.BooleanField(default=False, verbose_name='has_no_data_on_people_reached'),
+        ),
+        migrations.AlterField(
+            model_name='emergencyproject',
+            name='status',
+            field=models.CharField(choices=[('on_going', 'On-Going'), ('complete', 'Complete'), ('planned', 'Planned')], default=deployments.models.EmergencyProject.ActivityStatus('on_going'), max_length=40),
+        ),
+    ]

deployments/migrations/0059_auto_20220323_1028.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.27 on 2022-03-23 10:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('deployments', '0058_auto_20220322_1056'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='emergencyprojectactivity',
+            name='is_disaggregated_for_disabled',
+            field=models.NullBooleanField(verbose_name='is_disaggregated_for_disabled'),
+        ),
+    ]

deployments/models.py

@@ -523,8 +523,8 @@ class ActivityLead(TextChoices):
         DEPLOYED_ERU = 'deployed_eru', _('Deployed ERU')
 
     class ActivityStatus(TextChoices):
-        ON_GOING = 'on_going', _('Activity On-Going')
-        COMPLETE = 'complete', _('Activity Complete')
+        ON_GOING = 'on_going', _('On-Going')
+        COMPLETE = 'complete', _('Complete')
         PLANNED = 'planned', _('Planned')
 
     title = models.CharField(max_length=255, verbose_name=_('title'))
@@ -696,7 +696,11 @@ class PeopleHouseholds(TextChoices):
         related_name='activities',
     )
     is_simplified_report = models.BooleanField(verbose_name=_('is_simplified_report'), default=True)
-    is_disaggregated_for_disabled = models.BooleanField(verbose_name=_('is_disaggregated_for_disabled'), default=False)
+    is_disaggregated_for_disabled = models.NullBooleanField(
+        verbose_name=_('is_disaggregated_for_disabled'),
+        null=True, blank=True
+    )
+    has_no_data_on_people_reached = models.BooleanField(verbose_name=_('has_no_data_on_people_reached'), default=False)
     # Metrics
     people_households = models.CharField(
         max_length=50,