NCGEARS/cheesy-arena-lite
1
0
Fork 0
mirror of https://github.com/Team254/cheesy-arena-lite.git synced 2026-03-09 13:46:44 -04:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Remove remaining 2019-specific code.

Browse Source
This commit is contained in:
Patrick Fairbank
2020-03-22 13:59:07 -07:00
parent 80454117c7
commit de976ab59f
3 changed files with 35 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/alliance_station_display.js
View File

@@ -99,8 +99,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);
};
$(function() {

2
static/js/scoring_panel.js
View File

@@ -78,12 +78,10 @@ var handleMatchTime = function(data) {
$("#commitMatchScore").hide();
break;
case "POST_MATCH":
$("#preMatchMessage").hide();
$("#postMatchMessage").hide();
$("#commitMatchScore").css("display", "flex");
break;
default:
$("#preMatchMessage").hide();
$("#postMatchMessage").hide();
$("#commitMatchScore").hide();
}

82
web/scoring_panel_test.go
View File

@@ -5,6 +5,7 @@ package web
import (
"github.com/Team254/cheesy-arena/field"
"github.com/Team254/cheesy-arena/game"
"github.com/Team254/cheesy-arena/websocket"
gorillawebsocket "github.com/gorilla/websocket"
"github.com/stretchr/testify/assert"
@@ -53,56 +54,39 @@ func TestScoringPanelWebsocket(t *testing.T) {
readWebsocketType(t, blueWs, "matchTime")
readWebsocketType(t, blueWs, "realtimeScore")
// TODO(pat): Update for 2020.
/*
// Send a some pre-match scoring commands.
redWs.Write("1", nil)
blueWs.Write("2", nil)
blueWs.Write("2", nil)
blueWs.Write("2", nil)
blueWs.Write("2", nil)
for i := 0; i < 5; i++ {
readWebsocketType(t, redWs, "realtimeScore")
readWebsocketType(t, blueWs, "realtimeScore")
}
assert.Equal(t, 1, web.arena.RedRealtimeScore.CurrentScore.RobotStartLevels[0])
assert.Equal(t, 0, web.arena.BlueRealtimeScore.CurrentScore.RobotStartLevels[1])
redWs.Write("e", nil)
redWs.Write("i", nil)
redWs.Write("i", nil)
redWs.Write("v", nil)
redWs.Write("q", nil)
redWs.Write(",", nil)
for i := 0; i < 3; i++ {
readWebsocketType(t, redWs, "realtimeScore")
readWebsocketType(t, blueWs, "realtimeScore")
}
assert.Equal(t, [8]game.BayStatus{1, 0, 0, 0, 0, 0, 0, 3},
web.arena.RedRealtimeScore.CurrentScore.CargoBaysPreMatch)
assert.Equal(t, [8]game.BayStatus{1, 0, 0, 0, 0, 0, 0, 3}, web.arena.RedRealtimeScore.CurrentScore.CargoBays)
assert.Equal(t, [3]game.BayStatus{0, 0, 0}, web.arena.RedRealtimeScore.CurrentScore.RocketNearLeftBays)
assert.Equal(t, [3]game.BayStatus{0, 0, 0}, web.arena.RedRealtimeScore.CurrentScore.RocketNearRightBays)
assert.Equal(t, [3]game.BayStatus{0, 0, 0}, web.arena.RedRealtimeScore.CurrentScore.RocketFarLeftBays)
assert.Equal(t, [3]game.BayStatus{0, 0, 0}, web.arena.RedRealtimeScore.CurrentScore.RocketFarRightBays)
// Send some autonomous period scoring commands.
web.arena.MatchState = field.AutoPeriod
redWs.Write("1", nil)
redWs.Write("3", nil)
redWs.Write("w", nil)
redWs.Write("X", nil)
redWs.Write("x", nil)
redWs.Write("z", nil)
for i := 0; i < 6; i++ {
readWebsocketType(t, redWs, "realtimeScore")
readWebsocketType(t, blueWs, "realtimeScore")
}
assert.Equal(t, [3]bool{true, false, true}, web.arena.RedRealtimeScore.CurrentScore.ExitedInitiationLine)
assert.Equal(t, [2]int{1, 0}, web.arena.RedRealtimeScore.CurrentScore.AutoCellsBottom)
assert.Equal(t, [2]int{0, 0}, web.arena.RedRealtimeScore.CurrentScore.AutoCellsOuter)
assert.Equal(t, [2]int{1, 0}, web.arena.RedRealtimeScore.CurrentScore.AutoCellsInner)
// Send some in-match scoring commands.
web.arena.MatchState = field.AutoPeriod
redWs.Write("e", nil)
redWs.Write("i", nil)
redWs.Write("k", nil)
redWs.Write("4", nil)
blueWs.Write("9", nil)
for i := 0; i < 5; i++ {
readWebsocketType(t, redWs, "realtimeScore")
readWebsocketType(t, blueWs, "realtimeScore")
}
assert.Equal(t, [8]game.BayStatus{1, 0, 0, 0, 0, 0, 0, 3},
web.arena.RedRealtimeScore.CurrentScore.CargoBaysPreMatch)
assert.Equal(t, [8]game.BayStatus{2, 0, 0, 0, 0, 0, 0, 2}, web.arena.RedRealtimeScore.CurrentScore.CargoBays)
assert.Equal(t, [3]game.BayStatus{0, 1, 0}, web.arena.RedRealtimeScore.CurrentScore.RocketFarRightBays)
assert.True(t, web.arena.RedRealtimeScore.CurrentScore.SandstormBonuses[0])
assert.Equal(t, 1, web.arena.BlueRealtimeScore.CurrentScore.RobotEndLevels[2])
*/
// Send some teleoperated period scoring commands.
web.arena.MatchState = field.TeleopPeriod
blueWs.Write("f", nil)
blueWs.Write("F", nil)
blueWs.Write("o", nil)
blueWs.Write("5", nil)
blueWs.Write("5", nil)
blueWs.Write("L", nil)
for i := 0; i < 6; i++ {
readWebsocketType(t, redWs, "realtimeScore")
readWebsocketType(t, blueWs, "realtimeScore")
}
assert.Equal(t, [4]int{2, 0, 0, 0}, web.arena.BlueRealtimeScore.CurrentScore.TeleopCellsOuter)
assert.Equal(t, [3]game.EndgameStatus{game.EndgameNone, game.EndgameHang, game.EndgameNone},
web.arena.BlueRealtimeScore.CurrentScore.EndgameStatuses)
assert.Equal(t, true, web.arena.BlueRealtimeScore.CurrentScore.RungIsLevel)
// Test committing logic.
redWs.Write("commitMatch", nil)