Update grant form texts for gender neutrality and consistency

Revised several Italian grant-related strings in `index.ts` to use more gender
neutral language and improve consistency in tone. This helps ensure the form
is welcoming and inclusive to all users, and maintains a coherent voice across
the application.

Author: estyxx

backend/conferences/migrations/0055_remove_conference_grants_default_accommodation_amount_and_more.py

@@ -7,6 +7,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('conferences', '0054_conference_frontend_revalidate_secret_and_more'),
+        ('grants', '0030_remove_grant_accommodation_amount_and_more'),
     ]
 
     operations = [

backend/grants/admin.py

@@ -5,8 +5,7 @@
 from django.contrib import admin, messages
 from django.contrib.admin import SimpleListFilter
 from django.db import transaction
-from django.db.models import Exists, IntegerField, OuterRef, Sum, Value
-from django.db.models.functions import Coalesce
+from django.db.models import Exists, OuterRef
 from django.db.models.query import QuerySet
 from django.urls import reverse
 from django.utils import timezone
@@ -172,27 +171,13 @@ class Meta:
 
 
 def _check_amounts_are_not_empty(grant: Grant, request):
-    if grant.total_amount is None:
+    if grant.total_allocated_amount == 0:
         messages.error(
             request,
             f"Grant for {grant.name} is missing 'Total Amount'!",
         )
         return False
 
-    if grant.has_approved_accommodation() and grant.accommodation_amount is None:
-        messages.error(
-            request,
-            f"Grant for {grant.name} is missing 'Accommodation Amount'!",
-        )
-        return False
-
-    if grant.has_approved_travel() and grant.travel_amount is None:
-        messages.error(
-            request,
-            f"Grant for {grant.name} is missing 'Travel Amount'!",
-        )
-        return False
-
     return True
 
 
@@ -216,10 +201,10 @@ def send_reply_emails(modeladmin, request, queryset):
 
     for grant in queryset:
         if grant.status in (Grant.Status.approved,):
-            if grant.approved_type is None:
+            if not grant.reimbursements.exists():
                 messages.error(
                     request,
-                    f"Grant for {grant.name} is missing 'Grant Approved Type'!",
+                    f"Grant for {grant.name} is missing reimbursement categories!",
                 )
                 return
 
@@ -663,11 +648,6 @@ def get_queryset(self, request):
                         requester_id=OuterRef("user_id"),
                     )
                 ),
-                total_allocated_amount=Coalesce(
-                    Sum("reimbursements__granted_amount"),
-                    Value(0),
-                    output_field=IntegerField(),
-                ),
             )
         )
 

backend/grants/migrations/0030_remove_grant_accommodation_amount_and_more.py

@@ -132,7 +132,7 @@ def reverse_migration(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('conferences', '0055_remove_conference_grants_default_accommodation_amount_and_more'),
+        ('conferences', '0054_conference_frontend_revalidate_secret_and_more'),
         ('grants', '0029_alter_grant_pending_status'),
     ]
 

backend/grants/summary.py

@@ -44,7 +44,7 @@ def calculate(self, conference_id):
             filtered_grants, statuses
         )
         gender_stats = self._aggregate_data_by_gender(filtered_grants, statuses)
-        financial_summary, total_amount = self._aggregate_financial_data_by_status_new(
+        financial_summary, total_amount = self._aggregate_financial_data_by_status(
             filtered_grants, statuses
         )
         grant_type_summary = self._aggregate_data_by_grant_type(

backend/grants/tasks.py

@@ -1,17 +1,15 @@
+import logging
 from datetime import timedelta
 from urllib.parse import urljoin
 
 from django.conf import settings
 from django.utils import timezone
-from notifications.models import EmailTemplate, EmailTemplateIdentifier
 
-from users.models import User
 from grants.models import Grant
 from integrations import slack
-
-import logging
-
+from notifications.models import EmailTemplate, EmailTemplateIdentifier
 from pycon.celery import app
+from users.models import User
 
 logger = logging.getLogger(__name__)
 
@@ -32,7 +30,7 @@ def send_grant_reply_approved_email(*, grant_id, is_reminder):
     variables = {
         "reply_url": reply_url,
         "start_date": f"{grant.conference.start:%-d %B}",
-        "end_date": f"{grant.conference.end+timedelta(days=1):%-d %B}",
+        "end_date": f"{grant.conference.end + timedelta(days=1):%-d %B}",
         "deadline_date_time": f"{grant.applicant_reply_deadline:%-d %B %Y %H:%M %Z}",
         "deadline_date": f"{grant.applicant_reply_deadline:%-d %B %Y}",
         "visa_page_link": urljoin(settings.FRONTEND_URL, "/visa"),
@@ -42,12 +40,19 @@ def send_grant_reply_approved_email(*, grant_id, is_reminder):
     }
 
     if grant.has_approved_travel():
-        if not grant.travel_amount:
+        from grants.models import GrantReimbursementCategory
+
+        travel_reimbursements = grant.reimbursements.filter(
+            category__category=GrantReimbursementCategory.Category.TRAVEL
+        )
+        travel_amount = sum(r.granted_amount for r in travel_reimbursements)
+
+        if not travel_amount or travel_amount == 0:
             raise ValueError(
                 "Grant travel amount is set to Zero, can't send the email!"
             )
 
-        variables["travel_amount"] = f"{grant.travel_amount:.0f}"
+        variables["travel_amount"] = f"{travel_amount:.0f}"
 
     _new_send_grant_email(
         template_identifier=EmailTemplateIdentifier.grant_approved,

backend/grants/tests/factories.py

@@ -1,14 +1,16 @@
+import random
+from decimal import Decimal
+
 import factory.fuzzy
 from factory.django import DjangoModelFactory
 
 from conferences.tests.factories import ConferenceFactory
-from grants.models import Grant
-from helpers.constants import GENDERS
-from users.tests.factories import UserFactory
 from countries import countries
-from participants.tests.factories import ParticipantFactory
+from grants.models import Grant, GrantReimbursement, GrantReimbursementCategory
+from helpers.constants import GENDERS
 from participants.models import Participant
-import random
+from participants.tests.factories import ParticipantFactory
+from users.tests.factories import UserFactory
 
 
 class GrantFactory(DjangoModelFactory):
@@ -57,3 +59,54 @@ def _create(self, model_class, *args, **kwargs):
             ParticipantFactory(user_id=grant.user.id, conference=grant.conference)
 
         return grant
+
+
+class GrantReimbursementCategoryFactory(DjangoModelFactory):
+    class Meta:
+        model = GrantReimbursementCategory
+
+    conference = factory.SubFactory(ConferenceFactory)
+    name = factory.LazyAttribute(
+        lambda obj: GrantReimbursementCategory.Category(obj.category).label
+    )
+    description = factory.Faker("sentence", nb_words=6)
+    max_amount = factory.fuzzy.FuzzyInteger(0, 1000)
+    category = factory.fuzzy.FuzzyChoice(
+        [choice[0] for choice in GrantReimbursementCategory.Category.choices]
+    )
+    included_by_default = False
+
+    class Params:
+        ticket = factory.Trait(
+            category=GrantReimbursementCategory.Category.TICKET,
+            name="Ticket",
+            max_amount=Decimal("100"),
+            included_by_default=True,
+        )
+        travel = factory.Trait(
+            category=GrantReimbursementCategory.Category.TRAVEL,
+            name="Travel",
+            max_amount=Decimal("500"),
+            included_by_default=False,
+        )
+        accommodation = factory.Trait(
+            category=GrantReimbursementCategory.Category.ACCOMMODATION,
+            name="Accommodation",
+            max_amount=Decimal("300"),
+            included_by_default=False,
+        )
+        other = factory.Trait(
+            category=GrantReimbursementCategory.Category.OTHER,
+            name="Other",
+            max_amount=Decimal("200"),
+            included_by_default=False,
+        )
+
+
+class GrantReimbursementFactory(DjangoModelFactory):
+    class Meta:
+        model = GrantReimbursement
+
+    grant = factory.SubFactory(GrantFactory)
+    category = factory.SubFactory(GrantReimbursementCategoryFactory)
+    granted_amount = factory.fuzzy.FuzzyInteger(0, 1000)

backend/grants/tests/test_admin.py

@@ -1,21 +1,24 @@
 from datetime import timedelta
+from decimal import Decimal
 from unittest.mock import call
 
-from conferences.models.conference_voucher import ConferenceVoucher
-from conferences.tests.factories import ConferenceFactory, ConferenceVoucherFactory
-from grants.tests.factories import GrantFactory
 import pytest
 from django.utils import timezone
 
+from conferences.models.conference_voucher import ConferenceVoucher
+from conferences.tests.factories import ConferenceFactory, ConferenceVoucherFactory
 from grants.admin import (
     confirm_pending_status,
     create_grant_vouchers,
+    mark_rejected_and_send_email,
     reset_pending_status_back_to_status,
     send_reply_emails,
-    mark_rejected_and_send_email,
 )
 from grants.models import Grant
-
+from grants.tests.factories import (
+    GrantFactory,
+    GrantReimbursementFactory,
+)
 
 pytestmark = pytest.mark.django_db
 
@@ -60,9 +63,11 @@ def test_send_reply_emails_with_grants_from_multiple_conferences_fails(
     mock_send_rejected_email.assert_not_called()
 
 
-def test_send_reply_emails_approved_grant_missing_approved_type(rf, mocker, admin_user):
+def test_send_reply_emails_approved_grant_missing_reimbursements(
+    rf, mocker, admin_user
+):
     mock_messages = mocker.patch("grants.admin.messages")
-    grant = GrantFactory(status=Grant.Status.approved, approved_type=None)
+    grant = GrantFactory(status=Grant.Status.approved)
     request = rf.get("/")
     request.user = admin_user
     mock_send_approved_email = mocker.patch(
@@ -73,20 +78,21 @@ def test_send_reply_emails_approved_grant_missing_approved_type(rf, mocker, admi
 
     mock_messages.error.assert_called_once_with(
         request,
-        f"Grant for {grant.name} is missing 'Grant Approved Type'!",
+        f"Grant for {grant.name} is missing reimbursement categories!",
     )
     mock_send_approved_email.assert_not_called()
 
 
 def test_send_reply_emails_approved_missing_amount(rf, mocker, admin_user):
     mock_messages = mocker.patch("grants.admin.messages")
-    grant = GrantFactory(
-        status=Grant.Status.approved,
-        approved_type=Grant.ApprovedType.ticket_accommodation,
-        total_amount=None,
+    grant = GrantFactory(status=Grant.Status.approved)
+    # Create reimbursement with 0 amount so total_allocated_amount is 0
+    GrantReimbursementFactory(
+        grant=grant,
+        category__conference=grant.conference,
+        category__ticket=True,
+        granted_amount=Decimal("0"),
     )
-    grant.total_amount = None
-    grant.save()
     request = rf.get("/")
     request.user = admin_user
     mock_send_approved_email = mocker.patch(
@@ -106,10 +112,19 @@ def test_send_reply_emails_approved_set_deadline_in_fourteen_days(
     rf, mocker, admin_user
 ):
     mock_messages = mocker.patch("grants.admin.messages")
-    grant = GrantFactory(
-        status=Grant.Status.approved,
-        approved_type=Grant.ApprovedType.ticket_accommodation,
-        total_amount=800,
+    grant = GrantFactory(status=Grant.Status.approved)
+    GrantReimbursementFactory(
+        grant=grant,
+        category__conference=grant.conference,
+        category__ticket=True,
+        granted_amount=Decimal("100"),
+    )
+    GrantReimbursementFactory(
+        grant=grant,
+        category__conference=grant.conference,
+        category__accommodation=True,
+        category__max_amount=Decimal("700"),
+        granted_amount=Decimal("700"),
     )
     request = rf.get("/")
     request.user = admin_user