Merge pull request #2520 from IFRCGo/feature/dref3-changes

DREF3 changes

Author: szabozoltan69

dref/serializers.py

@@ -1622,9 +1622,9 @@ def get_type_of_onset(self, obj):
         return Dref.OnsetType(type_of_onset).label
 
     def get_crisis_categorization(self, obj):
-        if obj.disaster_category:
+        if hasattr(obj, "disaster_category") and obj.disaster_category is not None:
             return Dref.DisasterCategory(obj.disaster_category).label
-        return "Unknown category"
+        return "Yellow (?)"
 
     def get_amount_approved(self, obj):
         if hasattr(obj, "amount_requested"):
@@ -1677,9 +1677,9 @@ def get_affected_people(self, obj):
 
     def get_targeted_people(self, obj):
         t = type(obj).__name__
-        if t == "Dref" and hasattr(obj, "total_targeted_population"):
+        if t != "DrefOperationalUpdate" and hasattr(obj, "total_targeted_population"):  # A + FR:
             return obj.total_targeted_population
-        if t != "Dref" and hasattr(obj, "number_of_people_targeted"):  # OU + FR:
+        if t == "DrefOperationalUpdate" and hasattr(obj, "number_of_people_targeted"):
             return obj.number_of_people_targeted
 
     def get_beneficiaries_assisted(self, obj):

dref/views.py

@@ -359,7 +359,7 @@ def get_objects_by_appeal_code(self, appeal_code):
         drefs = (
             Dref.objects.filter(appeal_code=appeal_code)
             .prefetch_related("planned_interventions", "needs_identified", "national_society_actions", "users")
-            .order_by("-created_at")
+            .order_by("created_at")
             .distinct()
         )
         drefs = filter_dref_queryset_by_user_access(user, drefs)
@@ -370,7 +370,7 @@ def get_objects_by_appeal_code(self, appeal_code):
         operational_updates = (
             DrefOperationalUpdate.objects.filter(appeal_code=appeal_code)
             .prefetch_related("planned_interventions", "needs_identified", "national_society_actions", "users")
-            .order_by("-created_at")
+            .order_by("created_at")
             .distinct()
         )
         operational_updates = filter_dref_queryset_by_user_access(user, operational_updates)
@@ -380,7 +380,7 @@ def get_objects_by_appeal_code(self, appeal_code):
         final_reports = (
             DrefFinalReport.objects.filter(appeal_code=appeal_code)
             .prefetch_related("planned_interventions", "needs_identified", "national_society_actions", "users")
-            .order_by("-created_at")
+            .order_by("created_at")
             .distinct()
         )
         final_reports = filter_dref_queryset_by_user_access(user, final_reports)
@@ -399,14 +399,16 @@ def retrieve(self, request, *args, **kwargs):
 
         serialized_data = []
         ops_update_count = 0
-        a = ["First", "Second", "Third", "Fourth", "Fifth", "Sixth", "Seventh", "Eighth", "Nineth", "Tenth"]
+        allocation_count = 1  # Dref Application is always the first allocation
+        a = ["First", "Second", "Third", "Fourth", "Fifth", "Sixth", "Seventh", "Eighth", "Ninth", "Tenth"]
         for instance in instances:
             if isinstance(instance, Dref):
                 serializer = Dref3Serializer(instance, context={"stage": "Application", "allocation": a[0]})
             elif isinstance(instance, DrefOperationalUpdate):
                 ops_update_count += 1
-                if instance.additional_allocation and len(a) > ops_update_count:
-                    allocation = a[ops_update_count]
+                if instance.additional_allocation and len(a) > allocation_count:
+                    allocation = a[allocation_count]
+                    allocation_count += 1
                 else:
                     allocation = "No allocation"
                 serializer = DrefOperationalUpdate3Serializer(