Merge pull request #1488 from IFRCGo/fix/flash-update-export-issue-for-empty-graphics

Solve issue for pdf export for empty graphics

Author: szabozoltan69

flash_update/admin.py

@@ -71,7 +71,7 @@ class FlashCountryDistrictAdminInline(admin.TabularInline):
 class FlashUpdateAdmin(TranslationAdmin):
     inlines = [FlashCountryDistrictAdminInline, FlashActionTakenAdminInline]
     search_fields = ('title',)
-    list_filter = ('hazard_type', 'share_with', 'flashcountrydistrict__country',)
+    list_filter = ('hazard_type', 'share_with', 'flash_country_district__country')
 
 
 admin.site.register(FlashAction, FlashActionAdmin)

flash_update/migrations/0011_auto_20220805_1047.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.28 on 2022-08-05 10:47
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('flash_update', '0010_auto_20220607_1157'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='flashcountrydistrict',
+            name='flash_update',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='flash_country_district', to='flash_update.FlashUpdate', verbose_name='Flash update'),
+        ),
+    ]

flash_update/models.py

@@ -138,7 +138,8 @@ def __str__(self):
 class FlashCountryDistrict(models.Model):
     flash_update = models.ForeignKey(
         FlashUpdate, on_delete=models.CASCADE,
-        verbose_name=_('Flash update')
+        verbose_name=_('Flash update'),
+        related_name='flash_country_district'
     )
     country = models.ForeignKey(
         Country, verbose_name=_('country'), on_delete=models.CASCADE,

flash_update/serializers.py

@@ -114,7 +114,7 @@ class FlashUpdateSerializer(
     NestedCreateMixin,
     serializers.ModelSerializer
 ):
-    country_district = FlashCountryDistrictSerializer(source='flashcountrydistrict_set', many=True, required=False)
+    country_district = FlashCountryDistrictSerializer(source='flash_country_district', many=True, required=False)
     references = FlashReferencesSerializer(many=True, required=False)
     actions_taken = FlashActionsTakenSerializer(source='actions_taken_flash', many=True, required=False)
     created_by_details = UserNameSerializer(source='created_by', read_only=True)

flash_update/views.py

@@ -39,7 +39,23 @@ class FlashUpdateViewSet(viewsets.ModelViewSet):
     filterset_class = FlashUpdateFilter
 
     def get_queryset(self):
-        return FlashUpdate.objects.all().order_by('-created_at').distinct()
+        return FlashUpdate.objects.all().select_related(
+            'hazard_type',
+            'created_by',
+            'modified_by',
+        ).prefetch_related(
+            'references',
+            'references__document',
+            'map',
+            'map__created_by',
+            'graphics',
+            'graphics__created_by',
+            'actions_taken_flash__flash_update',
+            'actions_taken_flash__actions',
+            'flash_country_district__flash_update',
+            'flash_country_district__country',
+            'flash_country_district__district'
+        ).order_by('-created_at').distinct()
 
 
 class FlashUpdateFileViewSet(
@@ -51,7 +67,7 @@ class FlashUpdateFileViewSet(
     serializer_class = FlashGraphicMapSerializer
 
     def get_queryset(self):
-        return FlashGraphicMap.objects.all()
+        return FlashGraphicMap.objects.all().select_related('created_by')
 
     @action(
         detail=False,

notifications/templates/email/flash_update/flash_pdf.html

@@ -56,21 +56,25 @@ <h2 class="heading">Situational Overview</h2>
 
         <h2 class="heading">Graphics and Maps</h2>
 
+        {% if not map_list|length == 0 %}
         <table>
             <tr>
             {% for map in map_list %}
                 <td><img style='width:100%; height:100%;' src="{{map.image}}" alt="image"><br><p class='caption'>{{map.caption}}</p></td>
             {% endfor %}
             </tr>
         </table>
+        {% endif %}
 
+        {% if not graphic_list|length == 0 %}
         <table>
             <tr>
             {% for graphic in graphic_list %}
                 <td><img style='width:100%; height:100%;' src="{{graphic.image}}" alt="image"><br><p class='caption'>{{graphic.caption}}</p></td>
             {% endfor %}
             </tr>
         </table>
+        {% endif %}
 
         <h2 class="heading">Actions Taken</h2>