change how latest financial years are calculated

ThreeSixtyGiving · Jan 17, 2025 · 593eb58 · 593eb58
1 parent 7e13ea4
commit 593eb58
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/jinja2/grantmakers/partials/fundertable.html.j2 b/jinja2/grantmakers/partials/fundertable.html.j2
@@ -95,11 +95,10 @@
     <td class="tr">{{ display_number(object.current_year.funds_unrestricted, format_str="£{:,.0f}") }}</td>
     <td class="tr">{{ display_number(object.current_year.employees, format_str="{:,.0f}") }}</td>
     <td class="tr">
-        {% if object.current_year %}
-        Current: {{ display_number(object.current_year.scaling, format_str="{:,.0f}") }}<br>
-        {% endif %}
-        {% if object.latest_year %}
+        {% if object.latest_year != object.current_year %}
         Latest: {{ display_number(object.latest_year.scaling, format_str="{:,.0f}") }}
+        {% elif object.current_year %}
+        Current: {{ display_number(object.current_year.scaling, format_str="{:,.0f}") }}
         {% endif %}
     </td>
     {% else %}

diff --git a/jinja2/grantmakers/task/detail.html.j2 b/jinja2/grantmakers/task/detail.html.j2
@@ -118,13 +118,10 @@
     <td class="tr">{{ display_number(object.funds_unrestricted, format_str="£{:,.0f}") }}</td>
     <td class="tr">{{ display_number(object.employees, format_str="{:,.0f}") }}</td>
     <td class="tr">
-        This: {{ display_number(object.scaling, format_str="{:,.0f}") }}<br>
-        {% if object.funder.current_year %}
-        Current:
-        {{ display_number(object.funder.current_year.scaling, format_str="{:,.0f}") }}<br>
-        {% endif %}
-        {% if object.funder.latest_year %}
+        {% if object.funder.latest_year != object.funder.current_year %}
         Latest: {{ display_number(object.funder.latest_year.scaling, format_str="{:,.0f}") }}
+        {% elif object.funder.current_year %}
+        Current: {{ display_number(object.funder.current_year.scaling, format_str="{:,.0f}") }}
         {% endif %}
     </td>
 </tr>

diff --git a/ukgrantmaking/management/commands/funders/update_financial_year.py b/ukgrantmaking/management/commands/funders/update_financial_year.py
@@ -57,6 +57,12 @@
         WHERE status != 'Future'
         ORDER BY fy DESC
     ),
+    funder_year_count AS (
+        SELECT funder_financial_year_id,
+            COUNT(*) AS funder_years
+        FROM {ukgrantmaking_funderyear} fy
+        GROUP BY 1
+    ),
     latest_ffy AS (
         SELECT DISTINCT ON (funder_id)
             funder_id,
@@ -65,6 +71,9 @@
         FROM {ukgrantmaking_funderfinancialyear} ffy
             INNER JOIN current_fys
                 ON ffy.financial_year_id = current_fys.fy
+            LEFT OUTER JOIN funder_year_count
+                ON ffy.id = funder_year_count.funder_financial_year_id
+        WHERE funder_year_count.funder_years > 0
         ORDER BY funder_id ASC, current_fys.fy DESC
     )
     UPDATE {ukgrantmaking_funder}