wip

Author: tudoramariei

backend/donations/views/dashboard/admin_dashboard.py

@@ -60,43 +60,43 @@ def _get_header_stats(today) -> List[List[Dict[str, Union[str, int | datetime]]]
             {
                 "title": _("Donations this year"),
                 "icon": "edit_document",
-                "metric": current_year_redirections["metric"],
+                "metric": current_year_redirections()["metric"],
                 "footer": _create_stat_link(
-                    url=f'{reverse("admin:donations_donor_changelist")}?{current_year_range}', text=_("View all")
+                    url=f"{reverse('admin:donations_donor_changelist')}?{current_year_range}", text=_("View all")
                 ),
-                "timestamp": current_year_redirections["timestamp"],
+                "timestamp": current_year_redirections()["timestamp"],
             },
             {
                 "title": _("Donations all-time"),
                 "icon": "edit_document",
-                "metric": all_redirections["metric"],
+                "metric": all_redirections()["metric"],
                 "footer": _create_stat_link(url=reverse("admin:donations_donor_changelist"), text=_("View all")),
-                "timestamp": all_redirections["timestamp"],
+                "timestamp": all_redirections()["timestamp"],
             },
             {
                 "title": _("NGOs registered"),
                 "icon": "foundation",
-                "metric": all_active_ngos["metric"],
+                "metric": all_active_ngos()["metric"],
                 "footer": _create_stat_link(
-                    url=f'{reverse("admin:donations_ngo_changelist")}?is_active=1', text=_("View all")
+                    url=f"{reverse('admin:donations_ngo_changelist')}?is_active=1", text=_("View all")
                 ),
-                "timestamp": all_active_ngos["timestamp"],
+                "timestamp": all_active_ngos()["timestamp"],
             },
             {
                 "title": _("Functioning NGOs"),
                 "icon": "foundation",
-                "metric": ngos_active_in_current_year["metric"],
-                "footer": _create_stat_link(url=f'{reverse("admin:donations_ngo_changelist")}', text=_("View all")),
-                "timestamp": ngos_active_in_current_year["timestamp"],
+                "metric": ngos_active_in_current_year()["metric"],
+                "footer": _create_stat_link(url=f"{reverse('admin:donations_ngo_changelist')}", text=_("View all")),
+                "timestamp": ngos_active_in_current_year()["timestamp"],
             },
             {
                 "title": _("NGOs from NGO Hub"),
                 "icon": "foundation",
-                "metric": ngos_with_ngo_hub["metric"],
+                "metric": ngos_with_ngo_hub()["metric"],
                 "footer": _create_stat_link(
-                    url=f'{reverse("admin:donations_ngo_changelist")}?is_active=1&has_ngohub=1', text=_("View all")
+                    url=f"{reverse('admin:donations_ngo_changelist')}?is_active=1&has_ngohub=1", text=_("View all")
                 ),
-                "timestamp": ngos_with_ngo_hub["timestamp"],
+                "timestamp": ngos_with_ngo_hub()["timestamp"],
             },
         ]
     ]
@@ -146,7 +146,7 @@ def _format_yearly_stats(statistics) -> List[Dict[str, Union[int, List[Dict]]]]:
                     "metric": statistic["donations"],
                     "label": statistic.get("donations_difference"),
                     "footer": _create_stat_link(
-                        url=f'{reverse("admin:donations_donor_changelist")}?date_created__year={statistic["year"]}',
+                        url=f"{reverse('admin:donations_donor_changelist')}?date_created__year={statistic['year']}",
                         text=_("View all"),
                     ),
                     "timestamp": statistic["timestamp"],
@@ -157,7 +157,7 @@ def _format_yearly_stats(statistics) -> List[Dict[str, Union[int, List[Dict]]]]:
                     "metric": statistic["ngos_registered"],
                     "label": statistic.get("ngos_registered_difference"),
                     "footer": _create_stat_link(
-                        url=f'{reverse("admin:donations_ngo_changelist")}?date_created__year={statistic["year"]}',
+                        url=f"{reverse('admin:donations_ngo_changelist')}?date_created__year={statistic['year']}",
                         text=_("View all"),
                     ),
                     "timestamp": statistic["timestamp"],
@@ -168,7 +168,7 @@ def _format_yearly_stats(statistics) -> List[Dict[str, Union[int, List[Dict]]]]:
                     "metric": statistic["ngos_with_forms"],
                     "label": statistic.get("ngos_with_forms_difference"),
                     "footer": _create_stat_link(
-                        url=f'{reverse("admin:donations_ngo_changelist")}?has_forms=1&date_created__year={statistic["year"]}',
+                        url=f"{reverse('admin:donations_ngo_changelist')}?has_forms=1&date_created__year={statistic['year']}",
                         text=_("View all"),
                     ),
                     "timestamp": statistic["timestamp"],