fix for notes

change cleaning status to use funder financial year
ThreeSixtyGiving · Jan 17, 2025 · 7e13ea4 · 7e13ea4
1 parent 44314cd
commit 7e13ea4
Show file tree

Hide file tree

Showing 19 changed files with 584 additions and 122 deletions.
diff --git a/docs/data_model.md b/docs/data_model.md
@@ -80,7 +80,6 @@ the `Funder` model in these attributes will be copied to the equivalent `FunderF
 | `checked`                     | Whether this record has been checked by a user                                          |
 | `checked_on`                  | The time at which this record was marked as checked                                     |
 | `checked_by`                  | The user who marked this record as checked                                              |
-| `notes`                       | Any notes made about this financial year when checking                                  |
 
 #### FunderFinancialYear financial data
 

diff --git a/jinja2/grantmakers/partials/funderyear.html.j2 b/jinja2/grantmakers/partials/funderyear.html.j2
@@ -37,10 +37,12 @@
     {% if funder_year.account_url %}
     <br><a href="{{ funder_year.account_url }}" target="_blank">Accounts PDF</a>
     {% endif %}
-    {% if funder_year.notes %}
+    {% if funder_year.notes.count() %}
     <details>
         <summary>Note</summary>
-        {{ funder_year.notes|markdownify|safe }}<br>
+        {% for note in funder_year.notes.all() %}
+        {{ note.note|markdownify|safe }}<br>
+        {% endfor %}
     </details>
     {% endif %}
 </td>
@@ -245,7 +247,7 @@
             <tr>
                 <td class="tr">Note</td>
                 <td colspan="{% if funder_year_py %}3{% else %}2{% endif%}">
-                    <textarea name="note" class="funder-year-edit" rows="7">{{ funder_year.notes or '' }}</textarea>
+                    <textarea name="note" class="funder-year-edit" rows="7"></textarea>
                 </td>
             </tr>
         </tbody>

diff --git a/jinja2/grantmakers/partials/notes.html.j2 b/jinja2/grantmakers/partials/notes.html.j2
@@ -8,17 +8,20 @@
         {{ note.note|markdownify|safe }}
     </li>
     {% endfor %}
-    {% for funder_financial_year in object.funder_financial_years.filter(notes__isnull=false).exclude(notes__exact='') %}
+    {% for funder_financial_year in object.funder_financial_years.all() %}
+    {% for funder_year in funder_financial_year.funder_years.all() %}
+    {% for note in funder_year.notes.all() %}
     <li class="note">
         <header>
             <strong>FY{{ funder_financial_year.financial_year_id }}</strong>
-            <time
-                value="{{ funder_financial_year.checked_on }}">{{ funder_financial_year.checked_on|naturalday }}</time>
-            by <strong>{{ funder_financial_year.checked_by|user_name }}</strong>
+            <time value="{{ note.date_added }}">{{ note.date_added|naturalday }}</time>
+            by <strong>{{ note.added_by }}</strong>
         </header>
-        {{ funder_financial_year.notes|markdownify|safe }}
+        {{ note.note|markdownify|safe }}
     </li>
     {% endfor %}
+    {% endfor %}
+    {% endfor %}
     <li class="note">
         <header>Add note</header>
         <form action="{{ url_for('grantmakers:add_note', org_id=object.org_id) }}" method="post"

diff --git a/jinja2/grantmakers/task/detail.html.j2 b/jinja2/grantmakers/task/detail.html.j2
@@ -30,6 +30,12 @@
             <li>Showing all records</li>
             {% endif %}
         </ul>
+        {% if object._sql_query %}
+        <details>
+            <summary>SQL Query</summary>
+            <pre style="white-space: pre-wrap;">{{ object._sql_query }}</pre>
+        </details>
+        {% endif %}
     </details>
     {% if object.description %}
     <p>{{ object.description }}</p>
@@ -61,26 +67,25 @@
 {% if page_obj.object_list %}
 {% call wrap_table(class_="sticky") %}
 {% for object in page_obj.object_list %}
-<tr class="{% if object.funder_financial_year.checked == 'Checked' %}positive{% endif %}">
+<tr class="{% if object.checked == 'Checked' %}positive{% endif %}">
     <td><a class="b"
-            href="{{ url_for('grantmakers:detail', org_id=object.funder_financial_year.funder.org_id) }}">{{ object.funder_financial_year.funder.name }}</a>
-    <td><a
-            href="{{ url_for('grantmakers:detail', org_id=object.funder_financial_year.funder.org_id) }}">{{ object.funder_financial_year.funder.org_id }}</a>
+            href="{{ url_for('grantmakers:detail', org_id=object.funder.org_id) }}">{{ object.funder.name }}</a>
+    <td><a href="{{ url_for('grantmakers:detail', org_id=object.funder.org_id) }}">{{ object.funder.org_id }}</a>
     </td>
     </td>
-    <td>{{ display_text(object.funder_financial_year.segment) }}</td>
-    <td class="tc">{{ display_boolean(object.funder_financial_year.included) }}</td>
-    <td class="tc">{{ display_boolean(object.funder_financial_year.makes_grants_to_individuals) }}</td>
+    <td>{{ display_text(object.segment) }}</td>
+    <td class="tc">{{ display_boolean(object.included) }}</td>
+    <td class="tc">{{ display_boolean(object.makes_grants_to_individuals) }}</td>
     <td>
-        <ul class="tags">{% for tag in object.funder_financial_year.tags.values_list("tag", flat=true) %}<li>{{ tag }}
+        <ul class="tags">{% for tag in object.tags.values_list("tag", flat=true) %}<li>{{ tag }}
             </li>
             {% endfor %}</ul>
     </td>
     <td class="tc">
         <div class="flex-row">
-            {{ display_boolean(object.funder_financial_year.checked == "Checked") }}
-            {% if object.funder_financial_year.checked_by %}
-            {{ object.funder_financial_year.checked_by|user_name }}
+            {{ display_boolean(object.checked == "Checked") }}
+            {% if object.checked_by %}
+            {{ object.checked_by|user_name }}
             {% endif %}
         </div>
     </td>
@@ -113,13 +118,13 @@
     <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.funder_financial_year.scaling, format_str="{:,.0f}") }}<br>
-        {% if object.funder_financial_year.funder.current_year %}
+        This: {{ display_number(object.scaling, format_str="{:,.0f}") }}<br>
+        {% if object.funder.current_year %}
         Current:
-        {{ display_number(object.funder_financial_year.funder.current_year.scaling, format_str="{:,.0f}") }}<br>
+        {{ display_number(object.funder.current_year.scaling, format_str="{:,.0f}") }}<br>
         {% endif %}
-        {% if object.funder_financial_year.funder.latest_year %}
-        Latest: {{ display_number(object.funder_financial_year.funder.latest_year.scaling, format_str="{:,.0f}") }}
+        {% if object.funder.latest_year %}
+        Latest: {{ display_number(object.funder.latest_year.scaling, format_str="{:,.0f}") }}
         {% endif %}
     </td>
 </tr>

diff --git a/readme.md b/readme.md
@@ -178,6 +178,16 @@ without fetching any new data.
 
 #### `python manage.py update financial-year`
 
+This runs a series of SQL commands to keep the financial data up to date. The commands are:
+
+1. Ensure every funder has a funder financial year for the current financial year
+2. Set the current year to the correct year
+3. Set the latest year to the correct year
+4. Recalculate aggregate values for funder financial years
+5. Update current funder financial years with the latest funder data
+6. Ensure that the current funder financial year has the correct tags
+7. Remove existing tags from the current funder financial year
+
 #### `python manage.py update grants`
 
 #### `python manage.py update grant-recipient-type`
@@ -203,3 +213,9 @@ Should instead use the endpoint at `/grantmakers/upload`.
 #### `python manage.py fetch fgt`
 
 Used to import data from the back catalogue of Foundation Giving Trends.
+
+## Export data as backup
+
+```sh
+dokku postgres:export uk-grantmaking-data-db > ~/uk-grantmaking-data-db-20251701.export
+```
diff --git a/ukgrantmaking/admin/funder.py b/ukgrantmaking/admin/funder.py
@@ -1,4 +1,5 @@
 from django.contrib import admin
+from django.contrib.contenttypes.admin import GenericTabularInline
 from django.utils.html import format_html
 
 from ukgrantmaking.admin.csv_upload import CSVUploadModelAdmin
@@ -16,7 +17,7 @@ def funder_count(self, obj):
         return obj.funders.count()
 
 
-class FunderNoteInline(admin.TabularInline):
+class FunderNoteInline(GenericTabularInline):
     model = FunderNote
     extra = 0
     fields = (

diff --git a/ukgrantmaking/admin/funder_year.py b/ukgrantmaking/admin/funder_year.py
@@ -73,10 +73,6 @@ class FunderYearInline(admin.StackedInline):
                         "spending_grant_making_institutions_unknown_manual",
                     ),
                     ("spending_grant_making_institutions",),
-                    (
-                        "checked_by",
-                        "notes",
-                    ),
                 ],
             },
         ),
@@ -126,7 +122,6 @@ class FunderYearAdmin(CSVUploadModelAdmin):
         "income",
         "spending",
         "spending_charitable",
-        "checked",
     )
     show_facets = admin.ShowFacets.ALWAYS
     list_display_links = ("financial_year_end",)
@@ -136,8 +131,6 @@ class FunderYearAdmin(CSVUploadModelAdmin):
         "funder_financial_year__financial_year__fy",
         "funder_financial_year__segment",
         "funder_financial_year__category",
-        "checked",
-        ("checked_by", admin.EmptyFieldListFilter),
     )
     readonly_fields = (
         "income_registered",
@@ -162,8 +155,6 @@ class FunderYearAdmin(CSVUploadModelAdmin):
         "funds_restricted_registered",
         "funds_unrestricted_registered",
         "employees_registered",
-        "checked_on",
-        "checked",
         "date_added",
         "date_updated",
         # "funder_financial_year",
@@ -254,10 +245,6 @@ class FunderYearAdmin(CSVUploadModelAdmin):
             "Checked",
             {
                 "fields": [
-                    "checked",
-                    "checked_on",
-                    "checked_by",
-                    "notes",
                     "date_added",
                     "date_updated",
                 ]