Merge pull request #1803 from IFRCGo/feature/dref-approval

Feature/dref approval

Author: szabozoltan69

dref/migrations/0060_dreffinalreport_date_of_approval.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.19 on 2023-06-06 06:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dref', '0059_drefoperationalupdate_identified_gaps'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='date_of_approval',
+            field=models.DateField(blank=True, null=True, verbose_name='Date of Approval'),
+        ),
+    ]

dref/models.py

@@ -1268,6 +1268,11 @@ class DrefFinalReport(models.Model):
         verbose_name=_("National Society conducted description"), null=True, blank=True
     )
     financial_report_description = models.TextField(verbose_name=_("Financial Report Description"), null=True, blank=True)
+    date_of_approval = models.DateField(
+        verbose_name=_("Date of Approval"),
+        null=True,
+        blank=True,
+    )
 
     class Meta:
         verbose_name = _("Dref Final Report")

dref/serializers.py

@@ -87,6 +87,7 @@ class Meta:
             "is_published",
             "status",
             "status_display",
+            "date_of_approval"
         ]
 
     def get_application_type(self, obj):
@@ -120,7 +121,8 @@ class Meta:
             "application_type",
             "application_type_display",
             "status",
-            "status_display"
+            "status_display",
+            "date_of_approval"
         ]
 
     def get_application_type(self, obj):
@@ -173,6 +175,7 @@ class Meta:
             "unpublished_final_report_count",
             "status",
             "status_display",
+            "date_of_approval"
         ]
 
     def get_operational_update_details(self, obj):

dref/views.py

@@ -2,6 +2,7 @@
 from operator import attrgetter
 
 from django.utils.translation import gettext
+import django.utils.timezone as timezone
 from reversion.views import RevisionMixin
 
 from rest_framework import (
@@ -163,7 +164,8 @@ def get_published(self, request, pk=None, version=None):
         field_report.save(update_fields=["is_published", "status"])
         if not field_report.dref.is_final_report_created:
             field_report.dref.is_final_report_created = True
-            field_report.dref.save(update_fields=["is_final_report_created"])
+            field_report.date_of_approval = timezone.now().date()
+            field_report.dref.save(update_fields=["is_final_report_created", "date_of_approval"])
         serializer = DrefFinalReportSerializer(field_report, context={"request": request})
         return response.Response(serializer.data)