Merge branch 'develop' into feature/import-admin2

Author: szabozoltan69

api/serializers.py

@@ -468,17 +468,26 @@ class Meta:
 # The list serializer can include a smaller subset of the to-many fields.
 # Also include a very minimal one for linking, and no other related fields.
 class MiniEventSerializer(ModelSerializer):
+    countries_for_preview = MiniCountrySerializer(many=True, read_only=True)
+
     class Meta:
         model = Event
-        fields = ('name', 'dtype', 'id', 'slug', 'parent_event', 'emergency_response_contact_email')
+        fields = (
+            'name', 'dtype', 'id', 'slug', 'parent_event',
+            'emergency_response_contact_email', 'countries_for_preview'
+        )
 
 
 class ListMiniEventSerializer(ModelSerializer):
     dtype = DisasterTypeSerializer(read_only=True)
+    countries_for_preview = MiniCountrySerializer(many=True, read_only=True)
 
     class Meta:
         model = Event
-        fields = ('id', 'name', 'slug', 'dtype', 'auto_generated_source', 'emergency_response_contact_email')
+        fields = (
+            'id', 'name', 'slug', 'dtype', 'auto_generated_source',
+            'emergency_response_contact_email', 'countries_for_preview'
+        )
 
 
 class ListEventSerializer(EnumSupportSerializerMixin, ModelSerializer):
@@ -643,6 +652,7 @@ class DetailEventSerializer(EnumSupportSerializerMixin, ModelSerializer):
     ifrc_severity_level_display = serializers.CharField(source='get_ifrc_severity_level_display', read_only=True)
     featured_documents = EventFeaturedDocumentSerializer(many=True, read_only=True)
     links = EventLinkSerializer(many=True, read_only=True)
+    countries_for_preview = MiniCountrySerializer(many=True)
 
     class Meta:
         model = Event
@@ -651,7 +661,7 @@ class Meta:
             'disaster_start_date', 'created_at', 'auto_generated', 'appeals', 'contacts', 'key_figures', 'is_featured',
             'is_featured_region', 'field_reports', 'hide_attached_field_reports', 'hide_field_report_map', 'updated_at',
             'id', 'slug', 'tab_one_title', 'ifrc_severity_level', 'ifrc_severity_level_display', 'parent_event', 'glide',
-            'featured_documents', 'links',
+            'featured_documents', 'links', 'emergency_response_contact_email', 'countries_for_preview'
         )
         lookup_field = 'slug'
 

api/snapshots/snap_test_views.py

@@ -15,11 +15,14 @@
     ],
     'countries': [
     ],
+    'countries_for_preview': [
+    ],
     'created_at': '2008-01-01T00:00:00.123456Z',
     'disaster_start_date': '2009-04-25T12:40:23.062017Z',
     'districts': [
     ],
     'dtype': 1,
+    'emergency_response_contact_email': None,
     'featured_documents': [
         {
             'description': 'event-featured-document-description-QdWaAiOoeTjanGDxdNOQNEQFbaIJAabHUrIsbGSRBZlggHjpmNHqwrYzfxzDKpSotRfPPWcfzyyJEdOaSkfFBPYvKgHconSKErce',
@@ -90,11 +93,14 @@
     ],
     'countries': [
     ],
+    'countries_for_preview': [
+    ],
     'created_at': '2008-01-01T00:00:00.123456Z',
     'disaster_start_date': '2009-04-25T12:40:23.062017Z',
     'districts': [
     ],
     'dtype': 1,
+    'emergency_response_contact_email': None,
     'featured_documents': [
     ],
     'field_reports': [

deployments/migrations/0060_auto_20220323_1527.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.27 on 2022-03-23 15:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('deployments', '0059_auto_20220323_1028'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='emergencyprojectactivity',
+            name='has_no_data_on_people_reached',
+            field=models.NullBooleanField(verbose_name='Has no data on people reached'),
+        ),
+        migrations.AlterField(
+            model_name='emergencyprojectactivity',
+            name='is_disaggregated_for_disabled',
+            field=models.NullBooleanField(verbose_name='Is disaggregated for disabled'),
+        ),
+    ]

deployments/models.py

@@ -697,10 +697,13 @@ class PeopleHouseholds(TextChoices):
     )
     is_simplified_report = models.BooleanField(verbose_name=_('is_simplified_report'), default=True)
     is_disaggregated_for_disabled = models.NullBooleanField(
-        verbose_name=_('is_disaggregated_for_disabled'),
+        verbose_name=_('Is disaggregated for disabled'),
+        null=True, blank=True
+    )
+    has_no_data_on_people_reached = models.NullBooleanField(
+        verbose_name=_('Has no data on people reached'),
         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,

deployments/snapshots/snap_tests.py

@@ -590,6 +590,7 @@
             'end_date': '2008-01-01',
             'event': 2,
             'event_detail': {
+                'countries_for_preview': [],
                 'dtype': 1,
                 'id': 2,
                 'name': 'event-KRWmlNOzBGufzQgliEupaqypCWrvtLUKaqPxSpdQhDtkzRGTXt',
@@ -688,6 +689,7 @@
             'end_date': '2008-01-01',
             'event': 2,
             'event_detail': {
+                'countries_for_preview': [],
                 'dtype': 1,
                 'id': 2,
                 'name': 'event-KRWmlNOzBGufzQgliEupaqypCWrvtLUKaqPxSpdQhDtkzRGTXt',
@@ -778,6 +780,7 @@
             'end_date': '2008-01-01',
             'event': 4,
             'event_detail': {
+                'countries_for_preview': [],
                 'dtype': 4,
                 'id': 4,
                 'name': 'event-IsCNxZRSZemDffzlsegkrhSjFjnHObsARIiEwACVPbsmebZoHP',
@@ -879,6 +882,7 @@
     'end_date': '2008-01-01',
     'event': 2,
     'event_detail': {
+        'countries_for_preview': [],
         'dtype': 1,
         'id': 2,
         'name': 'event-KRWmlNOzBGufzQgliEupaqypCWrvtLUKaqPxSpdQhDtkzRGTXt',
@@ -970,6 +974,7 @@
     'end_date': '2008-01-01',
     'event': 2,
     'event_detail': {
+        'countries_for_preview': [],
         'dtype': 1,
         'id': 2,
         'name': 'event-KRWmlNOzBGufzQgliEupaqypCWrvtLUKaqPxSpdQhDtkzRGTXt',