feat: sorting the results by ranks where squares not available (#1023)

Co-authored-by: Adam Zahradník <[email protected]>

Author: lukaskogaborik

bullet/bullet_admin/views/results.py

@@ -30,6 +30,7 @@ def get_context_data(self, **kwargs):
         assert self.detection
         ctx = super().get_context_data(**kwargs)
         competition = get_active_competition(self.request)
+        ctx["competition"] = competition
         ctx["country"], ctx["language"] = self.detection
         ctx["venues"] = Venue.objects.for_competition(competition)
         ctx["my_venues"] = Venue.objects.for_request(self.request)

bullet/problems/logic/results.py

@@ -27,7 +27,12 @@ def get_results(
 
     return (
         ResultRow.objects.filter(id__in=rows)
-        .order_by("-solved_count", "-solved_problems", "competition_time")
+        .order_by(
+            "-solved_count",
+            "-solved_problems",
+            "competition_time",
+            "team__rank_international",
+        )
         .select_related("team", "team__school", "team__venue", "team__venue__category")
         .prefetch_related("team__contestants", "team__contestants__grade")
     )

bullet/problems/templates/problems/results.html

@@ -33,11 +33,18 @@ <h2 class="text-2xl md:text-4xl mt-4 font-semibold">
       </a>
 
       {% for c in countries %}
+        {% if c != "__" %}{# __ is the legacy OPEN category #}
         <a href="{% if competition_number %}{% country_url "archive_results_category" category=category.identifier competition_number=competition_number country=c.code|lower %}{% else %}{% country_url "results_category" category=category.identifier country=c.code|lower %}{% endif %}{% query_transform %}"
-           class="{% if c == country %} bg-primary text-white font-bold {% else %} bg-gray-100 {% endif %} whitespace-nowrap py-1 px-2 rounded-sm flex gap-2 items-center flex-wrap">
+          class="{% if c == country %} bg-primary text-white font-bold {% else %} bg-gray-100 {% endif %} whitespace-nowrap py-1 px-2 rounded-sm flex gap-2 items-center flex-wrap">
           <iconify-icon icon="flag:{{ c.code|lower }}-4x3" width="none" class="h-4 aspect-4/3"></iconify-icon>
           {{ c.name }}
         </a>
+        {% else %}
+        <a href="{% if competition_number %}{% country_url "archive_results_category" category=category.identifier competition_number=competition_number country=c.code|lower %}{% else %}{% country_url "results_category" category=category.identifier country=c.code|lower %}{% endif %}{% query_transform %}"
+          class="{% if c == country %} bg-primary text-white font-bold {% else %} bg-gray-100 {% endif %} whitespace-nowrap py-1 px-2 rounded-sm flex gap-2 items-center flex-wrap">
+          Open
+        </a>
+        {% endif %}
       {% endfor %}
     </div>
     {% include "problems/results/table.html" %}