Fix to pull

.pre-commit-config.yaml

@@ -1,21 +1,21 @@
 exclude: 'static/.*'
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
     -   id: check-merge-conflict
     -   id: check-added-large-files
 -   repo: https://github.com/psf/black
-    rev: 24.3.0
+    rev: 24.10.0
     hooks:
     -   id: black
 -   repo: https://github.com/PyCQA/isort
     rev: 5.13.2
     hooks:
     -   id: isort
 -   repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.1.1
     hooks:
     -   id: flake8

nablapps/core/views.py

@@ -15,7 +15,7 @@
 from nablapps.blog.models import BlogPost
 
 from ..accounts.models import FysmatClass
-from ..events.models import Event
+from ..events.models import Event, EventRegistration
 from ..nabladet.models import Nablad
 from ..nablaforum.models import Channel, Message, Thread
 from ..news.models import FrontPageNews
@@ -67,6 +67,11 @@ def get_context_data(self, **kwargs):
         context["logged_in"] = True if self.request.user.is_authenticated else False
         # Uncomment when fadderperiode to display new student popup.
         # context["newuser_popup"] = False if self.request.user.is_authenticated else True
+
+        # TODO: fiks SQL query
+        context["bedpres_leaderboard"] = EventRegistration.objects.raw(
+            """SELECT COUNT(attendance_registration), username from EventRegistration JOIN users WHERE EventRegistration.userId = users.id JOIN event where EventRegistration.eventId = event.id WHERE EventRegistration.date > "2024 - 08 - 10" AND EventRegistration.date < "2025 - 06 - 20" AND event.is_bedpres GROUP BY userId LIMIT 10"""
+        )
         return context
 
     def _add_news(self, context):

static/css/front_page.css

@@ -157,6 +157,10 @@
     grid-area: poll;
 }
 
+.leaderboard {
+    grid-area: leaderboard;
+}
+
 .latest-podcast {
     grid-area: latest-podcast;
 }

templates/front_page.html

@@ -68,7 +68,16 @@ <h5 class="nabla-frontpage-header">
         <div class="leaderboard d-flex flex-column">
             <h5 class="nabla-frontpage-header">
                 Bedpres leaderboard
-            </h5>
+            </h5> <!-- Ren kok fra code_golf.html -->
+            <table style="width:100%">
+                <tr><th>Bruker</th><th>Antall Bedpres</th></tr>
+                {% for t in bedpres_leaderboard %}
+                <tr>
+                    <td>{{t.user.get_full_name}}</td>
+                    <td>{{t.length}}</td> <!-- TODO: hva skal stå her istedenfor length???, Funker dette egentlig? -->
+                </tr>
+                {% endfor %}
+            </table>
         </div>
 
         <div class="latest-nablad d-flex flex-column">