+
{ fmt.Sprint(series.Team1Wins) } - { fmt.Sprint(series.Team2Wins) }
}
@@ -88,27 +227,29 @@ templ seriesTeamRow(season *db.Season, league *db.League, team *db.Team, seed *i
}
isTBD := team == nil
}}
-
-
+
if seed != nil {
-
+
{ fmt.Sprint(*seed) }
} else {
- -
+ -
}
if isTBD {
TBD
} else {
- @links.TeamLinkInSeason(team, season, league)
+
+ @links.TeamLinkInSeason(team, season, league)
+
if isWinner {
- ✓
+ ✓
}
}
if matchesToWin > 1 {
-
{ fmt.Sprint(wins) }
diff --git a/internal/view/seasonsview/playoff_helpers.go b/internal/view/seasonsview/playoff_helpers.go
index 3dc7db9..79ae8ec 100644
--- a/internal/view/seasonsview/playoff_helpers.go
+++ b/internal/view/seasonsview/playoff_helpers.go
@@ -1,76 +1,18 @@
package seasonsview
-import "git.haelnorr.com/h/oslstats/internal/db"
+import (
+ "encoding/json"
-// groupSeriesByRound groups playoff series by their round field
-func groupSeriesByRound(series []*db.PlayoffSeries) map[string][]*db.PlayoffSeries {
- grouped := make(map[string][]*db.PlayoffSeries)
+ "git.haelnorr.com/h/oslstats/internal/db"
+)
+
+// seriesByNumber returns a map of series_number -> *PlayoffSeries for quick lookup
+func seriesByNumber(series []*db.PlayoffSeries) map[int]*db.PlayoffSeries {
+ m := make(map[int]*db.PlayoffSeries, len(series))
for _, s := range series {
- grouped[s.Round] = append(grouped[s.Round], s)
- }
- return grouped
-}
-
-// getRoundOrder returns the display order of rounds for a given format
-func getRoundOrder(format db.PlayoffFormat) []string {
- switch format {
- case db.PlayoffFormat5to6:
- return []string{
- "upper_bracket",
- "lower_bracket",
- "upper_final",
- "lower_final",
- "grand_final",
- }
- case db.PlayoffFormat7to9:
- return []string{
- "quarter_final",
- "semi_final",
- "third_place",
- "grand_final",
- }
- case db.PlayoffFormat10to15:
- return []string{
- "qualifying_final",
- "elimination_final",
- "semi_final",
- "preliminary_final",
- "third_place",
- "grand_final",
- }
- default:
- return nil
- }
-}
-
-// formatRoundName converts a round slug to a human-readable name
-func formatRoundName(round string) string {
- switch round {
- case "upper_bracket":
- return "Upper Bracket"
- case "lower_bracket":
- return "Lower Bracket"
- case "upper_final":
- return "Upper Final"
- case "lower_final":
- return "Lower Final"
- case "quarter_final":
- return "Quarter Finals"
- case "semi_final":
- return "Semi Finals"
- case "qualifying_final":
- return "Qualifying Finals"
- case "elimination_final":
- return "Elimination Finals"
- case "preliminary_final":
- return "Preliminary Finals"
- case "third_place":
- return "Third Place Playoff"
- case "grand_final":
- return "Grand Final"
- default:
- return round
+ m[s.SeriesNumber] = s
}
+ return m
}
// formatLabel returns a human-readable format description
@@ -86,3 +28,59 @@ func formatLabel(format db.PlayoffFormat) string {
return string(format)
}
}
+
+// bracketConnection represents a line to draw between two series cards
+type bracketConnection struct {
+ From int `json:"from"`
+ To int `json:"to"`
+ Type string `json:"type"` // "winner" or "loser"
+ ToSide string `json:"toSide,omitempty"` // "left" or "right" — enters side of dest card
+}
+
+// connectionsJSON returns a JSON string of connections for the bracket overlay JS.
+// Connections are derived from the series advancement links stored in the DB.
+// For the 10-15 format, QF winner lines enter PF cards from the side.
+func connectionsJSON(series []*db.PlayoffSeries) string {
+ // Build a lookup of series ID → series for resolving advancement targets
+ byID := make(map[int]*db.PlayoffSeries, len(series))
+ for _, s := range series {
+ byID[s.ID] = s
+ }
+
+ var conns []bracketConnection
+ for _, s := range series {
+ if s.WinnerNextID != nil {
+ if target, ok := byID[*s.WinnerNextID]; ok {
+ conn := bracketConnection{
+ From: s.SeriesNumber,
+ To: target.SeriesNumber,
+ Type: "winner",
+ }
+ // QF winners enter PF cards from the side in the 10-15 format
+ if s.Round == "qualifying_final" && target.Round == "preliminary_final" {
+ if s.SeriesNumber == 1 {
+ conn.ToSide = "left"
+ } else if s.SeriesNumber == 2 {
+ conn.ToSide = "right"
+ }
+ }
+ conns = append(conns, conn)
+ }
+ }
+ if s.LoserNextID != nil {
+ if target, ok := byID[*s.LoserNextID]; ok {
+ conns = append(conns, bracketConnection{
+ From: s.SeriesNumber,
+ To: target.SeriesNumber,
+ Type: "loser",
+ })
+ }
+ }
+ }
+
+ b, err := json.Marshal(conns)
+ if err != nil {
+ return "[]"
+ }
+ return string(b)
+}
diff --git a/internal/view/seasonsview/season_league_finals.templ b/internal/view/seasonsview/season_league_finals.templ
index 102f6a4..3742fbe 100644
--- a/internal/view/seasonsview/season_league_finals.templ
+++ b/internal/view/seasonsview/season_league_finals.templ
@@ -13,42 +13,39 @@ templ SeasonLeagueFinalsPage(season *db.Season, league *db.League, bracket *db.P
templ SeasonLeagueFinals(season *db.Season, league *db.League, bracket *db.PlayoffBracket) {
{{
- status := season.GetStatus()
permCache := contexts.Permissions(ctx)
canManagePlayoffs := permCache != nil && permCache.HasPermission(permissions.PlayoffsManage)
}}
if bracket != nil {
@PlayoffBracketView(season, league, bracket)
- } else if status == db.StatusInProgress || status == db.StatusUpcoming {
- @finalsRegularSeasonInProgress(season, league, canManagePlayoffs)
+ } else if canManagePlayoffs {
+ @finalsNotYetConfigured(season, league)
} else {
@finalsNotConfigured()
}
}
-templ finalsRegularSeasonInProgress(season *db.Season, league *db.League, canManagePlayoffs bool) {
+templ finalsNotYetConfigured(season *db.Season, league *db.League) {
-
Regular Season in Progress
+
No Finals Configured
- Finals will be available once the regular season is complete.
+ Set up the playoff bracket for this league.
- if canManagePlayoffs {
-
- Begin Finals
-
- }
+
+ Begin Finals
+
}
diff --git a/internal/view/seasonsview/status_badge.templ b/internal/view/seasonsview/status_badge.templ
index 537e98a..d49d851 100644
--- a/internal/view/seasonsview/status_badge.templ
+++ b/internal/view/seasonsview/status_badge.templ
@@ -1,7 +1,6 @@
package seasonsview
import "git.haelnorr.com/h/oslstats/internal/db"
-import "time"
// StatusBadge renders a season status badge
// Parameters:
@@ -10,53 +9,34 @@ import "time"
// - useShortLabels: bool - true for "Active/Finals", false for "In Progress/Finals in Progress"
templ StatusBadge(season *db.Season, compact bool, useShortLabels bool) {
{{
- now := time.Now()
+ seasonStatus := season.GetStatus()
status := ""
statusBg := ""
-
- // Determine status based on dates
- if now.Before(season.StartDate) {
+
+ switch seasonStatus {
+ case db.StatusUpcoming:
status = "Upcoming"
statusBg = "bg-blue"
- } else if !season.FinalsStartDate.IsZero() {
- // Finals are scheduled
- if !season.FinalsEndDate.IsZero() && now.After(season.FinalsEndDate.Time) {
- // Finals have ended
- status = "Completed"
- statusBg = "bg-teal"
- } else if now.After(season.FinalsStartDate.Time) {
- // Finals are in progress
- if useShortLabels {
- status = "Finals"
- } else {
- status = "Finals in Progress"
- }
- statusBg = "bg-yellow"
- } else if !season.EndDate.IsZero() && now.After(season.EndDate.Time) {
- // Regular season ended, finals upcoming
- status = "Finals Soon"
- statusBg = "bg-peach"
- } else {
- // Regular season active, finals scheduled for later
- if useShortLabels {
- status = "Active"
- } else {
- status = "In Progress"
- }
- statusBg = "bg-green"
- }
- } else if !season.EndDate.IsZero() && now.After(season.EndDate.Time) {
- // No finals scheduled and regular season ended
- status = "Completed"
- statusBg = "bg-teal"
- } else {
- // Regular season active, no finals scheduled
+ case db.StatusInProgress:
if useShortLabels {
status = "Active"
} else {
status = "In Progress"
}
statusBg = "bg-green"
+ case db.StatusFinalsSoon:
+ status = "Finals Soon"
+ statusBg = "bg-peach"
+ case db.StatusFinals:
+ if useShortLabels {
+ status = "Finals"
+ } else {
+ status = "Finals in Progress"
+ }
+ statusBg = "bg-yellow"
+ case db.StatusCompleted:
+ status = "Completed"
+ statusBg = "bg-teal"
}
}}