Rename "round" to "set number" for the scouting match list
The Blue Alliance refers to what we call "round" as "set number". To
simplify everything, we should adopt the terminology that The Blue
Alliance uses. This patch converts all uses of "round" to "set
number".
Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: Icc1b11554168fbb343e1fdfa597399951b2cb44d
diff --git a/scouting/webserver/requests/debug/cli/cli_test.py b/scouting/webserver/requests/debug/cli/cli_test.py
index 6189284..2bcd75b 100644
--- a/scouting/webserver/requests/debug/cli/cli_test.py
+++ b/scouting/webserver/requests/debug/cli/cli_test.py
@@ -62,7 +62,7 @@
json_path = write_json_request({
"team": 100,
"match": 1,
- "round": 2,
+ "set_number": 2,
"comp_level": "quals",
"starting_quadrant": 3,
"auto_ball_1": True,
@@ -111,7 +111,7 @@
ClimbLevel: (request_data_scouting_response.ClimbLevel) Medium,
DefenseReceivedRating: (int32) 4,
Comment: (string) (len=35) "A very inspiring and useful comment",
- Round: (int32) 2,
+ SetNumber: (int32) 2,
CompLevel: (string) (len=5) "quals"
}"""), stdout)
diff --git a/scouting/webserver/requests/messages/request_all_matches_response.fbs b/scouting/webserver/requests/messages/request_all_matches_response.fbs
index 90401e3..9d3be62 100644
--- a/scouting/webserver/requests/messages/request_all_matches_response.fbs
+++ b/scouting/webserver/requests/messages/request_all_matches_response.fbs
@@ -2,7 +2,7 @@
table Match {
match_number:int (id: 0);
- round:int (id: 1);
+ set_number:int (id: 1);
comp_level:string (id: 2);
r1:int (id: 3);
r2:int (id: 4);
diff --git a/scouting/webserver/requests/messages/request_data_scouting_response.fbs b/scouting/webserver/requests/messages/request_data_scouting_response.fbs
index 8010284..071a848 100644
--- a/scouting/webserver/requests/messages/request_data_scouting_response.fbs
+++ b/scouting/webserver/requests/messages/request_data_scouting_response.fbs
@@ -16,7 +16,7 @@
table Stats {
team:int (id: 0);
match:int (id: 1);
- round:int (id: 20);
+ set_number:int (id: 20);
comp_level:string (id: 21);
missed_shots_auto:int (id: 2);
diff --git a/scouting/webserver/requests/messages/request_matches_for_team_response.fbs b/scouting/webserver/requests/messages/request_matches_for_team_response.fbs
index cbb1895..dcfec52 100644
--- a/scouting/webserver/requests/messages/request_matches_for_team_response.fbs
+++ b/scouting/webserver/requests/messages/request_matches_for_team_response.fbs
@@ -2,7 +2,7 @@
table Match {
match_number:int (id: 0);
- round:int (id: 1);
+ set_number:int (id: 1);
comp_level:string (id: 2);
r1:int (id: 3);
r2:int (id: 4);
diff --git a/scouting/webserver/requests/messages/submit_data_scouting.fbs b/scouting/webserver/requests/messages/submit_data_scouting.fbs
index b415c55..36990f5 100644
--- a/scouting/webserver/requests/messages/submit_data_scouting.fbs
+++ b/scouting/webserver/requests/messages/submit_data_scouting.fbs
@@ -16,7 +16,7 @@
table SubmitDataScouting {
team:int (id: 0);
match:int (id: 1);
- round:int (id: 19);
+ set_number:int (id: 19);
comp_level:string (id: 20);
missed_shots_auto:int (id: 2);
diff --git a/scouting/webserver/requests/requests.go b/scouting/webserver/requests/requests.go
index af52510..cef87aa 100644
--- a/scouting/webserver/requests/requests.go
+++ b/scouting/webserver/requests/requests.go
@@ -144,7 +144,7 @@
stats := db.Stats{
TeamNumber: request.Team(),
MatchNumber: request.Match(),
- Round: request.Round(),
+ SetNumber: request.SetNumber(),
CompLevel: string(request.CompLevel()),
StartingQuadrant: request.StartingQuadrant(),
AutoBallPickedUp: [5]bool{
@@ -209,7 +209,7 @@
for _, match := range matches {
response.MatchList = append(response.MatchList, &request_all_matches_response.MatchT{
MatchNumber: match.MatchNumber,
- Round: match.Round,
+ SetNumber: match.SetNumber,
CompLevel: match.CompLevel,
R1: match.R1,
R2: match.R2,
@@ -252,7 +252,7 @@
for _, match := range matches {
response.MatchList = append(response.MatchList, &request_all_matches_response.MatchT{
MatchNumber: match.MatchNumber,
- Round: match.Round,
+ SetNumber: match.SetNumber,
CompLevel: match.CompLevel,
R1: match.R1,
R2: match.R2,
@@ -296,7 +296,7 @@
response.StatsList = append(response.StatsList, &request_data_scouting_response.StatsT{
Team: stat.TeamNumber,
Match: stat.MatchNumber,
- Round: stat.Round,
+ SetNumber: stat.SetNumber,
CompLevel: stat.CompLevel,
StartingQuadrant: stat.StartingQuadrant,
AutoBall1: stat.AutoBallPickedUp[0],
@@ -395,7 +395,7 @@
// Add the match to the database.
err = handler.db.AddToMatch(db.Match{
MatchNumber: int32(match.MatchNumber),
- Round: int32(match.SetNumber),
+ SetNumber: int32(match.SetNumber),
CompLevel: match.CompLevel,
R1: red[0],
R2: red[1],
diff --git a/scouting/webserver/requests/requests_test.go b/scouting/webserver/requests/requests_test.go
index 20af93c..4dda143 100644
--- a/scouting/webserver/requests/requests_test.go
+++ b/scouting/webserver/requests/requests_test.go
@@ -84,7 +84,7 @@
builder.Finish((&submit_data_scouting.SubmitDataScoutingT{
Team: 971,
Match: 1,
- Round: 8,
+ SetNumber: 8,
CompLevel: "quals",
StartingQuadrant: 2,
AutoBall1: true,
@@ -121,15 +121,15 @@
db := MockDatabase{
matches: []db.Match{
{
- MatchNumber: 1, Round: 1, CompLevel: "qual",
+ MatchNumber: 1, SetNumber: 1, CompLevel: "qual",
R1: 5, R2: 42, R3: 600, B1: 971, B2: 400, B3: 200,
},
{
- MatchNumber: 2, Round: 1, CompLevel: "qual",
+ MatchNumber: 2, SetNumber: 1, CompLevel: "qual",
R1: 6, R2: 43, R3: 601, B1: 972, B2: 401, B3: 201,
},
{
- MatchNumber: 3, Round: 1, CompLevel: "qual",
+ MatchNumber: 3, SetNumber: 1, CompLevel: "qual",
R1: 7, R2: 44, R3: 602, B1: 973, B2: 402, B3: 202,
},
},
@@ -149,7 +149,7 @@
expected := request_all_matches_response.RequestAllMatchesResponseT{
MatchList: []*request_all_matches_response.MatchT{
- // MatchNumber, Round, CompLevel
+ // MatchNumber, SetNumber, CompLevel
// R1, R2, R3, B1, B2, B3
{
1, 1, "qual",
@@ -181,11 +181,11 @@
db := MockDatabase{
matches: []db.Match{
{
- MatchNumber: 1, Round: 1, CompLevel: "qual",
+ MatchNumber: 1, SetNumber: 1, CompLevel: "qual",
R1: 5, R2: 42, R3: 600, B1: 971, B2: 400, B3: 200,
},
{
- MatchNumber: 2, Round: 1, CompLevel: "qual",
+ MatchNumber: 2, SetNumber: 1, CompLevel: "qual",
R1: 6, R2: 43, R3: 601, B1: 972, B2: 401, B3: 201,
},
},
@@ -207,7 +207,7 @@
expected := request_matches_for_team_response.RequestMatchesForTeamResponseT{
MatchList: []*request_matches_for_team_response.MatchT{
- // MatchNumber, Round, CompLevel
+ // MatchNumber, SetNumber, CompLevel
// R1, R2, R3, B1, B2, B3
{
1, 1, "qual",
@@ -230,7 +230,7 @@
db := MockDatabase{
stats: []db.Stats{
{
- TeamNumber: 971, MatchNumber: 1, Round: 2, CompLevel: "quals",
+ TeamNumber: 971, MatchNumber: 1, SetNumber: 2, CompLevel: "quals",
StartingQuadrant: 1,
AutoBallPickedUp: [5]bool{true, false, false, false, true},
ShotsMissed: 1, UpperGoalShots: 2, LowerGoalShots: 3,
@@ -239,7 +239,7 @@
Comment: "a lovely comment", CollectedBy: "john",
},
{
- TeamNumber: 972, MatchNumber: 1, Round: 4, CompLevel: "extra",
+ TeamNumber: 972, MatchNumber: 1, SetNumber: 4, CompLevel: "extra",
StartingQuadrant: 2,
AutoBallPickedUp: [5]bool{false, false, true, false, false},
ShotsMissed: 2, UpperGoalShots: 3, LowerGoalShots: 4,
@@ -265,7 +265,7 @@
expected := request_data_scouting_response.RequestDataScoutingResponseT{
StatsList: []*request_data_scouting_response.StatsT{
{
- Team: 971, Match: 1, Round: 2, CompLevel: "quals",
+ Team: 971, Match: 1, SetNumber: 2, CompLevel: "quals",
MissedShotsAuto: 4, UpperGoalAuto: 5, LowerGoalAuto: 6,
MissedShotsTele: 1, UpperGoalTele: 2, LowerGoalTele: 3,
DefenseRating: 7,
@@ -278,7 +278,7 @@
Comment: "a lovely comment",
},
{
- Team: 972, Match: 1, Round: 4, CompLevel: "extra",
+ Team: 972, Match: 1, SetNumber: 4, CompLevel: "extra",
MissedShotsAuto: 5, UpperGoalAuto: 6, LowerGoalAuto: 7,
MissedShotsTele: 2, UpperGoalTele: 3, LowerGoalTele: 4,
DefenseRating: 8,
@@ -414,7 +414,7 @@
expectedMatches := []db.Match{
{
MatchNumber: 1,
- Round: 2,
+ SetNumber: 2,
CompLevel: "qual",
R1: 100,
R2: 200,