Add ranking to Recap review Grants

backend/reviews/admin.py

@@ -8,13 +8,23 @@
 
 from django import forms
 from django.contrib import admin, messages
-from django.db.models import Count, F, OuterRef, Prefetch, Subquery, Sum
+from django.db.models import (
+    Count,
+    F,
+    OuterRef,
+    Prefetch,
+    Subquery,
+    Sum,
+    CharField,
+    Value,
+)
+from django.db.models.functions import Concat, Cast, Coalesce
 from django.http.request import HttpRequest
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.urls import path, reverse
 from django.utils.safestring import mark_safe
-
+from django.contrib.postgres.aggregates import StringAgg
 from grants.models import Grant
 from participants.models import Participant
 from reviews.models import AvailableScoreOption, ReviewSession, UserReview
@@ -292,12 +302,39 @@ def _review_grants_recap_view(self, request, review_session):
                     F("total_score") / F("vote_count"),
                     output_field=FloatField(),
                 ),
-                is_a_speaker=Exists(
+                has_sent_proposals=Exists(
                     Submission.objects.non_cancelled().filter(
                         speaker_id=OuterRef("user_id"),
                         conference_id=review_session.conference_id,
                     )
                 ),
+                ranking=Coalesce(
+                    Subquery(
+                        Submission.objects.filter(
+                            speaker_id=OuterRef("user_id"),
+                            conference_id=OuterRef("conference_id"),
+                        )
+                        .annotate(
+                            ranking=StringAgg(
+                                Concat(
+                                    "rankings__tag__name",
+                                    Value(": "),
+                                    Cast("rankings__rank", CharField()),
+                                    Value("/"),
+                                    Cast(
+                                        "rankings__total_submissions_per_tag",
+                                        CharField(),
+                                    ),
+                                    output_field=CharField(),
+                                ),
+                                delimiter=", \n",
+                            )
+                        )
+                        .values("ranking")[:1]
+                    ),
+                    Value(""),
+                    output_field=CharField(),
+                ),
                 user_private_comment=Subquery(
                     UserReview.objects.filter(
                         review_session_id=review_session_id,
@@ -592,7 +629,7 @@ def _render_grant_review(
         context = dict(
             self.admin_site.each_context(request),
             grant=grant,
-            is_speaker=Submission.objects.non_cancelled()
+            has_sent_proposals=Submission.objects.non_cancelled()
             .filter(
                 speaker_id=grant.user_id,
                 conference_id=grant.conference_id,

backend/reviews/templates/grant-review.html

@@ -141,8 +141,8 @@ <h2>Grant</h2>
   </div>
 
   <div class="review-row">
-    <strong>Is Speaker?</strong>
-    <div>{{is_speaker|yesno}}</div>
+    <strong>Has sent proposal(s)?</strong>
+    <div>{{has_sent_proposals|yesno}}</div>
   </div>
 
   <div class="review-row">

backend/reviews/templates/grants-recap.html

@@ -143,6 +143,10 @@
                   <div class="text"><span>Votes</span></div>
                   <div class="clear"></div>
                 </th>
+                <th scope="col">
+                  <div class="text"><span>Ranking</span></div>
+                  <div class="clear"></div>
+                </th>
                 <th scope="col">
                   <div class="text"><span>Status</span></div>
                   <div class="clear"></div>
@@ -209,8 +213,8 @@
                       <span>{{item.get_interested_in_volunteering_display}}</span>
                     </li>
                     <li>
-                      <strong>Is a speaker?</strong>
-                      <span>{{item.is_a_speaker|yesno}}</span>
+                      <strong>Has sent proposal(s)?</strong>
+                      <span>{{item.has_sent_proposals|yesno}}</span>
                     </li>
                   </ul>
                 </td>
@@ -240,7 +244,16 @@
                     <p>{{ item.user_private_comment }}</p>
                   {% endif %}
                 </td>
-
+                <td>
+                  {% for submission in item.submissions.all %}
+                      {% for ranking in submission.rankings.all %}
+                          {{ ranking.tag.name }}: {{ ranking.rank }} / {{ ranking.total_submissions_per_tag }}<br>
+                      {% endfor %}
+                  {% empty %}
+                  -
+                      <!-- Display nothing or some placeholder if there are no submissions -->
+                  {% endfor %}
+              </td>
                 <td>
                   {{ item.get_status_display }}
                 </td>