fix(sections): cleaned stats, removed redundant button

esnvutbrno · Nov 15, 2023 · a59422c · a59422c
1 parent 52660a4
commit a59422c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/fiesta/apps/sections/templates/sections/parts/section_stats_buddy_btn.html b/fiesta/apps/sections/templates/sections/parts/section_stats_buddy_btn.html
diff --git a/fiesta/apps/sections/views/stats.py b/fiesta/apps/sections/views/stats.py
@@ -3,8 +3,9 @@
 from django.db import models
 from django.db.models import Count, OuterRef, Subquery
 from django.db.models.functions import Coalesce
+from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django_tables2 import Column, Table, TemplateColumn
+from django_tables2 import Column, Table
 
 from apps.buddy_system.models import BuddyRequest
 from apps.fiestatables.filters import BaseFilterSet, ProperDateFromToRangeFilter
@@ -52,18 +53,22 @@ def qs(self):
 
 
 class BuddyStatsTable(Table):
-    abbr = Column(verbose_name=_("Faculty"), attrs=dict(td=dict(title=lambda record: record.name)))
-    matched_buddy_requests = Column(verbose_name=_("Matched requests"))
-
-    actions = TemplateColumn(template_name="sections/parts/section_stats_buddy_btn.html")
+    university = Column(
+        verbose_name=_("University"), accessor="university.name", attrs=dict(td=dict(title=lambda record: record.name))
+    )
+    faculty = Column(verbose_name=_("Faculty"), accessor="abbr", attrs=dict(td=dict(title=lambda record: record.name)))
+    matched_buddy_requests = Column(
+        verbose_name=_("Matched requests"),
+        linkify=lambda record: reverse("buddy_system:requests") + f"?matcher_faculty={record.pk}",
+    )
 
     class Meta:
         model = Faculty
-        fields = ("abbr",)
 
-        sequence = (
-            "abbr",
-            "...",
+        fields = (
+            "university",
+            "faculty",
+            "matched_buddy_requests",
         )