Merge pull request #2417 from IFRCGo/feature/request-assistance-flag-on-admin

NS-request-assistance flag on Admin list page

Author: szabozoltan69

api/admin.py

@@ -301,13 +301,20 @@ class FieldReportContactInline(admin.TabularInline):
 
 
 class FieldReportAdmin(CompareVersionAdmin, RegionRestrictedAdmin, TranslationAdmin):
+
+    def assist(self, obj):
+        return "+" if obj.ns_request_assistance else ""
+
+    assist.boolean = ""
     country_in = "countries__pk__in"
     region_in = "regions__pk__in"
 
     inlines = [ActionsTakenInline, SourceInline, FieldReportContactInline]
     list_display = (
         "summary",
         "event",
+        "created_at",
+        "assist",
         "visibility",
     )
     list_select_related = ("event",)
@@ -325,7 +332,7 @@ class FieldReportAdmin(CompareVersionAdmin, RegionRestrictedAdmin, TranslationAd
     )
 
     readonly_fields = ("report_date", "created_at", "updated_at", "summary", "fr_num")
-    list_filter = [MembershipFilter]
+    list_filter = [MembershipFilter, "ns_request_assistance"]
     actions = [
         "create_events",
         "export_field_reports",

api/management/commands/ingest_ns_initiatives.py

@@ -18,12 +18,21 @@ class Command(BaseCommand):
     @transaction.atomic
     def handle(self, *args, **kwargs):
         logger.info("Starting NS Inititatives")
+        production = settings.GO_ENVIRONMENT == "production"
         api_key = settings.NS_INITIATIVES_API_KEY
-        urls = [
-            f"https://data-api.ifrc.org/api/esf?apikey={api_key}",
-            f"https://data-api.ifrc.org/api/nsia?apikey={api_key}",
-            f"https://data-api.ifrc.org/api/cbf?apikey={api_key}",
-        ]
+        if production:
+            urls = [
+                # languageCode can be en, es, fr, ar. If omitted, defaults to en.
+                f"https://data.ifrc.org/ESF_API/api/approvedApplications?languageCode=en&apiKey={api_key}",
+                f"https://data.ifrc.org/NSIA_API/api/approvedApplications?languageCode=en&apiKey={api_key}",
+                f"https://data.ifrc.org/CBF_API/api/approvedApplications?languageCode=en&apiKey={api_key}",
+            ]
+        else:
+            urls = [
+                f"https://data-staging.ifrc.org/ESF_API/api/approvedApplications?languageCode=en&apiKey={api_key}",
+                f"https://data-staging.ifrc.org/NSIA_API/api/approvedApplications?languageCode=en&apiKey={api_key}",
+                f"https://data-staging.ifrc.org/CBF_API/api/approvedApplications?languageCode=en&apiKey={api_key}",
+            ]
 
         responses = []
         for url in urls: