scouting: Add "defense received" and "comments" to the database
This patch makes it so the webserver saves the "defense received" and
"comment" fields to the database.
Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: I3a76518095f7b38360b5c43ae3a117215244c3da
diff --git a/scouting/webserver/requests/requests.go b/scouting/webserver/requests/requests.go
index 118fafb..2554941 100644
--- a/scouting/webserver/requests/requests.go
+++ b/scouting/webserver/requests/requests.go
@@ -149,15 +149,17 @@
request.AutoBall1(), request.AutoBall2(), request.AutoBall3(),
request.AutoBall4(), request.AutoBall5(),
},
- ShotsMissedAuto: request.MissedShotsAuto(),
- UpperGoalAuto: request.UpperGoalAuto(),
- LowerGoalAuto: request.LowerGoalAuto(),
- ShotsMissed: request.MissedShotsTele(),
- UpperGoalShots: request.UpperGoalTele(),
- LowerGoalShots: request.LowerGoalTele(),
- PlayedDefense: request.DefenseRating(),
- Climbing: int32(request.ClimbLevel()),
- CollectedBy: username,
+ ShotsMissedAuto: request.MissedShotsAuto(),
+ UpperGoalAuto: request.UpperGoalAuto(),
+ LowerGoalAuto: request.LowerGoalAuto(),
+ ShotsMissed: request.MissedShotsTele(),
+ UpperGoalShots: request.UpperGoalTele(),
+ LowerGoalShots: request.LowerGoalTele(),
+ PlayedDefense: request.DefenseRating(),
+ DefenseReceivedScore: request.DefenseReceivedRating(),
+ Climbing: int32(request.ClimbLevel()),
+ CollectedBy: username,
+ Comment: string(request.Comment()),
}
// Do some error checking.
@@ -329,23 +331,25 @@
var response RequestDataScoutingResponseT
for _, stat := range stats {
response.StatsList = append(response.StatsList, &request_data_scouting_response.StatsT{
- Team: stat.TeamNumber,
- Match: stat.MatchNumber,
- StartingQuadrant: stat.StartingQuadrant,
- AutoBall1: stat.AutoBallPickedUp[0],
- AutoBall2: stat.AutoBallPickedUp[1],
- AutoBall3: stat.AutoBallPickedUp[2],
- AutoBall4: stat.AutoBallPickedUp[3],
- AutoBall5: stat.AutoBallPickedUp[4],
- MissedShotsAuto: stat.ShotsMissedAuto,
- UpperGoalAuto: stat.UpperGoalAuto,
- LowerGoalAuto: stat.LowerGoalAuto,
- MissedShotsTele: stat.ShotsMissed,
- UpperGoalTele: stat.UpperGoalShots,
- LowerGoalTele: stat.LowerGoalShots,
- DefenseRating: stat.PlayedDefense,
- ClimbLevel: request_data_scouting_response.ClimbLevel(stat.Climbing),
- CollectedBy: stat.CollectedBy,
+ Team: stat.TeamNumber,
+ Match: stat.MatchNumber,
+ StartingQuadrant: stat.StartingQuadrant,
+ AutoBall1: stat.AutoBallPickedUp[0],
+ AutoBall2: stat.AutoBallPickedUp[1],
+ AutoBall3: stat.AutoBallPickedUp[2],
+ AutoBall4: stat.AutoBallPickedUp[3],
+ AutoBall5: stat.AutoBallPickedUp[4],
+ MissedShotsAuto: stat.ShotsMissedAuto,
+ UpperGoalAuto: stat.UpperGoalAuto,
+ LowerGoalAuto: stat.LowerGoalAuto,
+ MissedShotsTele: stat.ShotsMissed,
+ UpperGoalTele: stat.UpperGoalShots,
+ LowerGoalTele: stat.LowerGoalShots,
+ DefenseRating: stat.PlayedDefense,
+ DefenseReceivedRating: stat.DefenseReceivedScore,
+ ClimbLevel: request_data_scouting_response.ClimbLevel(stat.Climbing),
+ CollectedBy: stat.CollectedBy,
+ Comment: stat.Comment,
})
}