Add rank to announcer display.

Team254 · May 23, 2024 · 0a13bc1 · 0a13bc1
1 parent e17cc8f
commit 0a13bc1
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 19 deletions.
diff --git a/field/arena_notifiers.go b/field/arena_notifiers.go
@@ -124,11 +124,13 @@ func (arena *Arena) GenerateMatchLoadMessage() any {
 		teams[station] = allianceStation.Team
 	}
 
-	rankings := make(map[string]*game.Ranking)
+	rankings := make(map[string]int)
 	for _, allianceStation := range arena.AllianceStations {
 		if allianceStation.Team != nil {
-			rankings[strconv.Itoa(allianceStation.Team.Id)], _ =
-				arena.Database.GetRankingForTeam(allianceStation.Team.Id)
+			ranking, _ := arena.Database.GetRankingForTeam(allianceStation.Team.Id)
+			if ranking != nil {
+				rankings[strconv.Itoa(allianceStation.Team.Id)] = ranking.Rank
+			}
 		}
 	}
 
@@ -157,7 +159,7 @@ func (arena *Arena) GenerateMatchLoadMessage() any {
 		AllowSubstitution bool
 		IsReplay          bool
 		Teams             map[string]*model.Team
-		Rankings          map[string]*game.Ranking
+		Rankings          map[string]int
 		Matchup           *playoff.Matchup
 		RedOffFieldTeams  []*model.Team
 		BlueOffFieldTeams []*model.Team

diff --git a/static/js/alliance_station_display.js b/static/js/alliance_station_display.js
@@ -44,8 +44,7 @@ var handleMatchLoad = function(data) {
 
       var ranking = data.Rankings[team.Id];
       if (ranking && data.Match.Type === matchTypeQualification) {
-        var rankingText = ranking.Rank;
-        $("#teamRank").attr("data-alliance-bg", station[0]).text(rankingText);
+        $("#teamRank").attr("data-alliance-bg", station[0]).text(ranking);
       } else {
         $("#teamRank").attr("data-alliance-bg", station[0]).text("");
       }

diff --git a/templates/announcer_display.html b/templates/announcer_display.html
@@ -6,7 +6,8 @@ <h3 id="matchName" class="mt-4"></h3>
     <div class="col-sm-2"><h4>Team #</h4></div>
     <div class="col-sm-4"><h4>Nickname</h4></div>
     <div class="col-sm-2"><h4>School</h4></div>
-    <div class="col-sm-4"><h4>Location</h4></div>
+    <div class="col-sm-3"><h4>Location</h4></div>
+    <div class="col-sm-1"><h4>Rank</h4></div>
   </div>
 </div>
 <div id="teams"></div>

diff --git a/templates/announcer_display_match_load.html b/templates/announcer_display_match_load.html
@@ -3,9 +3,9 @@
   {{if eq .Match.Type playoffMatch}}
     <h4><b>Alliance {{.Match.PlayoffRedAlliance}}</b></h4>
   {{end}}
-  {{template "team" dict "alliance" "red" "team" (index .Teams "R1")}}
-  {{template "team" dict "alliance" "red" "team" (index .Teams "R2")}}
-  {{template "team" dict "alliance" "red" "team" (index .Teams "R3")}}
+  {{template "team" dict "alliance" "red" "team" (index .Teams "R1") "rankings" .Rankings}}
+  {{template "team" dict "alliance" "red" "team" (index .Teams "R2") "rankings" .Rankings}}
+  {{template "team" dict "alliance" "red" "team" (index .Teams "R3") "rankings" .Rankings}}
   {{range $team := .RedOffFieldTeams}}
     {{template "team" dict "alliance" "red" "team" $team "isOffField" true}}
   {{end}}
@@ -14,9 +14,9 @@ <h4><b>Alliance {{.Match.PlayoffRedAlliance}}</b></h4>
   {{if eq .Match.Type playoffMatch}}
     <h4><b>Alliance {{.Match.PlayoffBlueAlliance}}</b></h4>
   {{end}}
-  {{template "team" dict "alliance" "blue" "team" (index .Teams "B1")}}
-  {{template "team" dict "alliance" "blue" "team" (index .Teams "B2")}}
-  {{template "team" dict "alliance" "blue" "team" (index .Teams "B3")}}
+  {{template "team" dict "alliance" "blue" "team" (index .Teams "B1") "rankings" .Rankings}}
+  {{template "team" dict "alliance" "blue" "team" (index .Teams "B2") "rankings" .Rankings}}
+  {{template "team" dict "alliance" "blue" "team" (index .Teams "B3") "rankings" .Rankings}}
   {{range $team := .BlueOffFieldTeams}}
     {{template "team" dict "alliance" "blue" "team" $team "isOffField" true}}
   {{end}}
@@ -28,13 +28,16 @@ <h4><b>Alliance {{.Match.PlayoffBlueAlliance}}</b></h4>
     <div class="col-sm-2"><h2><b>{{.team.Id}}</b>{{if .isOffField}} (not on field){{end}}</h2></div>
     <div class="col-sm-4"><h2>{{.team.Nickname}}</h2></div>
     <div class="col-sm-2"><h5>{{.team.SchoolName}}</h5></div>
-    <div class="col-sm-3">
-      <div><h5>{{.team.City}}, {{.team.StateProv}}, {{.team.Country}}</h5></div>
-    </div>
+    <div class="col-sm-3"><div><h5>{{.team.City}}, {{.team.StateProv}}, {{.team.Country}}</h5></div></div>
     <div class="col-sm-1">
-      <button type="button" class="btn btn-secondary btn-sm" onclick="$('#team{{.team.Id}}Details').modal('show');">
-        More
-      </button>
+      <div class="row">
+        <div class="col-sm-6">{{if index .rankings (itoa .team.Id)}}{{index .rankings (itoa .team.Id)}}{{end}}</div>
+        <div class="col-sm-6">
+          <button type="button" class="btn btn-secondary btn-sm" onclick="$('#team{{.team.Id}}Details').modal('show');">
+            More
+          </button>
+        </div>
+      </div>
     </div>
     <div id="team{{.team.Id}}Details" class="modal">
       <div class="modal-dialog">

diff --git a/web/web.go b/web/web.go
@@ -11,6 +11,7 @@ import (
 	"log"
 	"net/http"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"text/template"
 
@@ -51,6 +52,9 @@ func NewWeb(arena *field.Arena) *Web {
 		"add": func(a, b int) int {
 			return a + b
 		},
+		"itoa": func(a int) string {
+			return strconv.Itoa(a)
+		},
 		"multiply": func(a, b int) int {
 			return a * b
 		},