From ab2fa93b2f94c808f55f8585bf626f7315da3afb Mon Sep 17 00:00:00 2001 From: Patrick Fairbank Date: Sat, 21 Mar 2020 14:49:49 -0700 Subject: [PATCH] Update announcer display for 2020. --- game/score.go | 2 ++ game/score_test.go | 2 ++ static/js/announcer_display.js | 4 ++-- templates/announcer_display.html | 24 ++++++++++++------------ 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/game/score.go b/game/score.go index 2090879..f9d0830 100644 --- a/game/score.go +++ b/game/score.go @@ -25,6 +25,7 @@ type ScoreSummary struct { AutoPowerCellPoints int AutoPoints int TeleopPowerCellPoints int + PowerCellPoints int ControlPanelPoints int EndgamePoints int FoulPoints int @@ -97,6 +98,7 @@ func (score *Score) Summarize(opponentFouls []Foul, teleopStarted bool) *ScoreSu summary.TeleopPowerCellPoints += 2 * score.TeleopCellsOuter[i] summary.TeleopPowerCellPoints += 3 * score.TeleopCellsInner[i] } + summary.PowerCellPoints = summary.AutoPowerCellPoints + summary.TeleopPowerCellPoints // Calculate control panel points and stages. for i := Stage1; i <= Stage3; i++ { diff --git a/game/score_test.go b/game/score_test.go index a5e9c86..b27ab15 100644 --- a/game/score_test.go +++ b/game/score_test.go @@ -17,6 +17,7 @@ func TestScoreSummary(t *testing.T) { assert.Equal(t, 84, redSummary.AutoPowerCellPoints) assert.Equal(t, 94, redSummary.AutoPoints) assert.Equal(t, 38, redSummary.TeleopPowerCellPoints) + assert.Equal(t, 122, redSummary.PowerCellPoints) assert.Equal(t, 10, redSummary.ControlPanelPoints) assert.Equal(t, 75, redSummary.EndgamePoints) assert.Equal(t, 0, redSummary.FoulPoints) @@ -31,6 +32,7 @@ func TestScoreSummary(t *testing.T) { assert.Equal(t, 12, blueSummary.AutoPowerCellPoints) assert.Equal(t, 17, blueSummary.AutoPoints) assert.Equal(t, 122, blueSummary.TeleopPowerCellPoints) + assert.Equal(t, 134, blueSummary.PowerCellPoints) assert.Equal(t, 30, blueSummary.ControlPanelPoints) assert.Equal(t, 50, blueSummary.EndgamePoints) assert.Equal(t, 33, blueSummary.FoulPoints) diff --git a/static/js/announcer_display.js b/static/js/announcer_display.js index aa889b9..b0f5cf3 100644 --- a/static/js/announcer_display.js +++ b/static/js/announcer_display.js @@ -44,8 +44,8 @@ var handleMatchTime = function(data) { // Handles a websocket message to update the match score. var handleRealtimeScore = function(data) { - $("#redScore").text(data.Red.ScoreSummary.Score - data.Red.ScoreSummary.HabClimbPoints); - $("#blueScore").text(data.Blue.ScoreSummary.Score - data.Blue.ScoreSummary.HabClimbPoints); + $("#redScore").text(data.Red.ScoreSummary.Score - data.Red.ScoreSummary.EndgamePoints); + $("#blueScore").text(data.Blue.ScoreSummary.Score - data.Blue.ScoreSummary.EndgamePoints); }; // Handles a websocket message to populate the final score data. diff --git a/templates/announcer_display.html b/templates/announcer_display.html index a96a4cb..dd74b08 100644 --- a/templates/announcer_display.html +++ b/templates/announcer_display.html @@ -62,32 +62,32 @@