From 6a3fc3caebf4ce4d062c898d5f6c69153d5ea20a Mon Sep 17 00:00:00 2001
From: Tudor Amariei <tudor.amariei@commitglobal.org>
Date: Mon, 27 May 2024 12:37:28 +0300
Subject: [PATCH] Update stats

- include counties data for this year
---
 backend/donations/views/admin.py       | 18 ++++++++++++++----
 backend/templates/v1/admin2/index.html | 12 ++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/backend/donations/views/admin.py b/backend/donations/views/admin.py
index 2aecc5b2..f9aba350 100644
--- a/backend/donations/views/admin.py
+++ b/backend/donations/views/admin.py
@@ -38,9 +38,9 @@ def get(self, request, *args, **kwargs):
     @cache_decorator(timeout=settings.CACHE_TIMEOUT_TINY, cache_key="ADMIN_STATS")
     def collect_stats(self):
         return {
-            "timestamp": timezone.now().strftime("%Y-%m-%d %H:%M:%S"),
+            "timestamp": timezone.now(),
             "years": self.get_yearly_data(),
-            "counties": self.get_conties_data(),
+            "counties": self.get_counties_data(),
             "all_time": self.get_all_time_data(),
         }
 
@@ -77,7 +77,7 @@ def get_yearly_data():
         }
 
     @staticmethod
-    def get_conties_data():
+    def get_counties_data():
         ngos_by_county = {
             county_stats["county"]: county_stats["count"]
             for county_stats in Ngo.active.values("county").annotate(count=Count("id"))
@@ -86,8 +86,18 @@ def get_conties_data():
             county_stats["county"]: county_stats["count"]
             for county_stats in Donor.objects.values("county").annotate(count=Count("id"))
         }
+        donations_by_county_current_year = {
+            county_stats["county"]: county_stats["count"]
+            for county_stats in Donor.objects.filter(date_created__year=timezone.now().year)
+            .values("county")
+            .annotate(count=Count("id"))
+        }
         return {
-            county: {"ngos": ngos_by_county.get(county, 0), "forms": donations_by_county.get(county, 0)}
+            county: {
+                "ngos": ngos_by_county.get(county, 0),
+                "forms": donations_by_county.get(county, 0),
+                "forms_current_year": donations_by_county_current_year.get(county, 0),
+            }
             for county in settings.LIST_OF_COUNTIES + ["1", "2", "3", "4", "5", "6", "RO"]
         }
 
diff --git a/backend/templates/v1/admin2/index.html b/backend/templates/v1/admin2/index.html
index bdebbad3..6b5020ca 100644
--- a/backend/templates/v1/admin2/index.html
+++ b/backend/templates/v1/admin2/index.html
@@ -9,7 +9,7 @@
         <div class="row">
             <div class="col-xs-12">
                 <h3>General stats</h3>
-                <p><small>Generate la: {{ stats_dict["timestamp"] }} GMT</small></p>
+                <p><small>Generate la: {{ stats_dict["timestamp"].strftime("%Y-%m-%d %H:%M:%S") }} GMT</small></p>
                 <p>ONG-uri înregistrate: <strong>{{ stats_dict["all_time"]["ngos"] }}</strong></p>
                 <p>ONG-uri către care s-a donat: <strong>{{ stats_dict["all_time"]["ngos_with_forms"] }}</strong></p>
                 <p>Formulare completate: <strong>{{ stats_dict["all_time"]["forms"] }}</strong></p>
@@ -38,13 +38,14 @@ <h3>General stats</h3>
 
         <div class="row">
             <div class="col-xs-12">
-                <h4>Statistici pe judet (total)</h4>
+                <h4>Statistici pe județ</h4>
                 <table class="table">
                     <thead>
                     <tr>
-                        <th>Judet/Sector</th>
+                        <th>Județ/Sector</th>
                         <th>ONG-uri</th>
-                        <th>Formulare</th>
+                        <th>Formulare ({{ stats_dict["timestamp"].strftime("%Y") }})</th>
+                        <th>Formulare (total)</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -54,6 +55,9 @@ <h4>Statistici pe judet (total)</h4>
                             <td>
                                 {{ value["ngos"] }}
                             </td>
+                            <td>
+                                {{ value["forms_current_year"] }}
+                            </td>
                             <td>
                                 {{ value["forms"] }}
                             </td>