From 77b4e061513063baa1c10bd518159aba6de5ee64 Mon Sep 17 00:00:00 2001
From: sto <puzzle.online.sto.radiated611@passmail.net>
Date: Fri, 31 Jul 2026 13:29:23 +0200
Subject: [PATCH] Shared scoreboard: extend UI for marathons

---
 app/controllers/concerns/contestants_concern.rb           | 2 +-
 app/controllers/contests_controller.rb                    | 2 +-
 app/views/contests/_scoreboard_desktop_marathon.html.slim | 2 +-
 app/views/contests/_scoreboard_desktop_single.html.slim   | 2 +-
 app/views/layouts/authenticated.html.slim                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/concerns/contestants_concern.rb b/app/controllers/concerns/contestants_concern.rb
index 727d5c8..5e84940 100644
--- a/app/controllers/concerns/contestants_concern.rb
+++ b/app/controllers/concerns/contestants_concern.rb
@@ -10,7 +10,7 @@ module ContestantsConcern
         contestant.time_seconds
       ] }
     elsif contest.ranking_mode == "theorical"
-      contest.contestants.sort_by { |contestant| contestant.completions.map { |completion| completion.projected_time }.sum }
+      contest.contestants.includes([ :completions, :offline ]).sort_by { |contestant| contestant.completions.map { |completion| completion.projected_time }.sum }
     end
   end
 end
diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb
index feecdca..d362040 100644
--- a/app/controllers/contests_controller.rb
+++ b/app/controllers/contests_controller.rb
@@ -211,7 +211,7 @@ class ContestsController < ApplicationController
     if params.key?(:autorefresh)
       @autorefresh = true
     end
-    @puzzles = @contest.puzzles.where(hidden: false).or(@contest.puzzles.where(hidden: nil)).order(:id)
+    @puzzles = @contest.puzzles.where(hidden: false).or(@contest.puzzles.where(hidden: nil)).includes([ :image_attachment ]).order(:id)
     @action_path = "/public/#{@contest.friendly_id}"
     @space = " "
     render :scoreboard
diff --git a/app/views/contests/_scoreboard_desktop_marathon.html.slim b/app/views/contests/_scoreboard_desktop_marathon.html.slim
index 3233ec2..5cd89d3 100644
--- a/app/views/contests/_scoreboard_desktop_marathon.html.slim
+++ b/app/views/contests/_scoreboard_desktop_marathon.html.slim
@@ -1,4 +1,4 @@
-.d-flex.flex-column style="height: calc(100vh - 180px)"
+.d-flex.flex-column style="height: calc(100vh - 210px); width: 100%;"
 
   = render "selectors"
 
diff --git a/app/views/contests/_scoreboard_desktop_single.html.slim b/app/views/contests/_scoreboard_desktop_single.html.slim
index 26eceb2..69cd866 100644
--- a/app/views/contests/_scoreboard_desktop_single.html.slim
+++ b/app/views/contests/_scoreboard_desktop_single.html.slim
@@ -1,5 +1,5 @@
 .row style="width: 100%;"
-  .mt-3.col-6.d-flex.flex-column style="height: calc(100vh - 260px)"
+  .col-6.d-flex.flex-column style="height: calc(100vh - 260px); margin-top: #{active_page("/public/event/") == "active" ? "0" : "1rem"};"
     .d-flex.flex-column style="overflow-y: auto"
       table.table.table-striped.table-hover
         thead
diff --git a/app/views/layouts/authenticated.html.slim b/app/views/layouts/authenticated.html.slim
index 4becc64..ab173ff 100644
--- a/app/views/layouts/authenticated.html.slim
+++ b/app/views/layouts/authenticated.html.slim
@@ -3,7 +3,7 @@ html
   = render "layouts/header"
 
   body
-    .container.mt-5
+    .container style="margin-top: 3rem !important;"
       - if @current_user
         .float-end style="margin-top: -5px;"
           nav.navbar.bg-body-primary