Merge pull request #1106 from torchbox/feature/269-scholarships-in-programme-pages

R1-269: Scholarships - Showing in programme pages

Author: patrickcuagan

rca/programmes/models.py

@@ -5,6 +5,7 @@
 from django.core.exceptions import ValidationError
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.db import models, transaction
+from django.db.models import Prefetch
 from django.utils.functional import cached_property
 from django.utils.safestring import mark_safe
 from django.utils.text import slugify
@@ -822,7 +823,10 @@ class ProgrammePage(TapMixin, ContactFieldsMixin, BasePage):
             [
                 FieldPanel("scholarships_title"),
                 FieldPanel("scholarships_information"),
-                FieldPanel("scholarship_accordion_items"),
+                FieldPanel(
+                    "scholarship_accordion_items",
+                    help_text="Override the automatically linked scholarships from 'Scholarships' snippets.",
+                ),
                 FieldPanel("scholarship_information_blocks"),
             ],
             heading="Scholarships",
@@ -1104,6 +1108,47 @@ def has_vepple_panorama(self):
 
         return False
 
+    @cached_property
+    def scholarship_items(self):
+        """Returns a list of scholarship items for this programme."""
+        # Prioritze scholarship_accordion_items, if available
+        if self.scholarship_accordion_items:
+            return self.scholarship_accordion_items
+
+        # Check for eligible scholarships based on the Scholarship snippet
+        if self.scholarship_set.exists():
+            # Prefetch related data to avoid n+1 queries
+            scholarships = self.scholarship_set.prefetch_related(
+                Prefetch(
+                    "eligable_programmes",
+                    queryset=ProgrammePage.objects.filter(live=True),
+                ),
+                "funding_categories",
+                "fee_statuses",
+            ).filter(active=True)
+
+            return [
+                {
+                    "value": {
+                        "heading": s.title,
+                        "introduction": s.summary,
+                        "eligible_programmes": ", ".join(
+                            str(x) for x in s.eligable_programmes.all()
+                        ),
+                        "funding_categories": ", ".join(
+                            x.title for x in s.funding_categories.all()
+                        ),
+                        "fee_statuses": ", ".join(
+                            x.title for x in s.fee_statuses.all()
+                        ),
+                        "value": s.value,
+                    }
+                }
+                for s in scholarships
+            ]
+
+        return []
+
     def get_context(self, request, *args, **kwargs):
         context = super().get_context(request, *args, **kwargs)
         context["related_sections"] = [

rca/project_styleguide/templates/patterns/molecules/accordion/accordion.html

@@ -50,10 +50,18 @@
             {% endif %}
             {% if scholarship %}
                 {# Scholarship fields #}
-                <p><strong>Eligible Programmes: </strong>{{ accordion.eligible_programmes }}</p>
-                <p><strong>Funding Categories: </strong>{{ accordion.funding_categories }}</p>
-                <p><strong>Eligible fee status: </strong>{{ accordion.fee_statuses }}</p>
-                <p><strong>Value: </strong>{{ accordion.value }}</p>
+                {% if accordion.eligible_programmes %}
+                    <p><strong>Eligible Programmes: </strong>{{ accordion.eligible_programmes }}</p>
+                {% endif %}
+                {% if accordion.funding_categories %}
+                    <p><strong>Funding Categories: </strong>{{ accordion.funding_categories }}</p>
+                {% endif %}
+                {% if accordion.fee_statuses %}
+                    <p><strong>Eligible fee status: </strong>{{ accordion.fee_statuses }}</p>
+                {% endif %}
+                {% if accordion.value %}
+                    <p><strong>Value: </strong>{{ accordion.value }}</p>
+                {% endif %}
             {% endif %}
         </div>
     </div>

rca/project_styleguide/templates/patterns/organisms/programme_tabs/fees-and-funding.html

@@ -50,15 +50,15 @@ <h5 class="fees__heading body body--one">{{ row.location }}</h5>
             <div class="overview__item">
                 <h4 class="overview__sub-heading heading heading--five">{{ page.scholarships_title }}</h4>
                 <p class="overview__introduction introduction">{{ page.scholarships_information }}</p>
-                <div class="overview__item-content">
-                    {% if page.scholarship_accordion_items %}
+                {% if page.scholarship_items %}
+                    <div class="overview__item-content">
                         <div class="overview__item-accordion">
-                            {% for accordion in page.scholarship_accordion_items %}
-                                {% include "patterns/molecules/accordion/accordion.html" with modifier='short' accordion=accordion.value accordion_id='3' %}
+                            {% for accordion in page.scholarship_items %}
+                                {% include "patterns/molecules/accordion/accordion.html" with modifier='short' accordion=accordion.value accordion_id='3' scholarship=True %}
                             {% endfor %}
                         </div>
-                    {% endif %}
-                </div>
+                    </div>
+                {% endif %}
             </div>
             {% if page.scholarship_information_blocks %}
                 <div class="overview__item">

rca/scholarships/models.py

@@ -204,7 +204,7 @@ def get_context(self, request, *args, **kwargs):
 
         programme = None
         results = []
-        queryset = Scholarship.objects.prefetch_related(
+        queryset = Scholarship.objects.filter(active=True).prefetch_related(
             "eligable_programmes", "funding_categories", "fee_statuses"
         )