diff --git a/backend/conferences/migrations/0046_merge_20240912_1003.py b/backend/conferences/migrations/0046_merge_20240912_1003.py new file mode 100644 index 0000000000..fbc73613cb --- /dev/null +++ b/backend/conferences/migrations/0046_merge_20240912_1003.py @@ -0,0 +1,15 @@ +# Generated by Django 5.0.8 on 2024-09-12 10:03 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("conferences", "0045_conference_logo"), + ( + "conferences", + "0045_remove_conference_grants_default_accommodation_amount_and_more", + ), + ] + + operations = [] diff --git a/backend/grants/models.py b/backend/grants/models.py index 416cabb42a..1b943beff0 100644 --- a/backend/grants/models.py +++ b/backend/grants/models.py @@ -37,6 +37,8 @@ class AidType(models.TextChoices): help_text="Automatically include this category in grants by default", ) + objects = GrantQuerySet().as_manager() + def __str__(self): return f"{self.name} ({self.conference.name})" @@ -55,6 +57,8 @@ class CountryAidAmount(models.Model): max_digits=6, decimal_places=0, help_text=_("Maximum amount for this category") ) + objects = GrantQuerySet().as_manager() + def __str__(self): return f"{self.country} ({self.conference.name}) - {self.max_amount}€" diff --git a/backend/reviews/admin.py b/backend/reviews/admin.py index d0466bf604..956d790d1f 100644 --- a/backend/reviews/admin.py +++ b/backend/reviews/admin.py @@ -17,7 +17,7 @@ from django.urls import path, reverse from django.utils.safestring import mark_safe -from grants.models import Grant +from grants.models import Grant, AidCategory from participants.models import Participant from reviews.models import AvailableScoreOption, ReviewSession, UserReview from submissions.models import Submission, SubmissionTag @@ -376,6 +376,12 @@ def _review_grants_recap_view(self, request, review_session): for choice in Grant.Status.choices if choice[0] in Grant.REVIEW_SESSION_STATUSES_OPTIONS ], + all_approved_category=[ + category + for category in AidCategory.objects.filter( + conference_id=review_session.conference_id + ) + ], all_statuses=Grant.Status.choices, review_session=review_session, title="Recap", diff --git a/backend/reviews/templates/grants-recap.html b/backend/reviews/templates/grants-recap.html index 1e5b2ef4b0..fd4c01e640 100644 --- a/backend/reviews/templates/grants-recap.html +++ b/backend/reviews/templates/grants-recap.html @@ -623,15 +623,15 @@