Refactor Printout component to enhance student ordering and include captain information

2026-04-08 14:22:47 -04:00
parent ea1bb70740
commit 5d2d019e87
1 changed files with 3 additions and 3 deletions
@@ -41,9 +41,8 @@ else
                @{
                    var students 
                        = context.Students
-                            .OrderByDescending(s => s == context.Captain)
-                            .ThenByDescending(e => e.Grade)
-                            .ThenByDescending(e => e.TsaYear)
+                            .OrderByDescending(s => context.Captain != null && context.Captain.Equals(s))
+                            .ThenByDescending(e => e.Grade + e.TsaYear)
                            .ThenBy(e => e.FirstName)
                            .ToArray();
                }
@@ -233,6 +232,7 @@ else
                    .AsNoTracking()
                    .Include(e => e.Event)
                    .Include(e => e.Students)
+                    .Include(e => e.Captain)
                    .OrderByEventFormatFirst()
                    .ThenBy(e => e.Event.Name)
                    .ThenBy(e => e.Identifier ?? "")