scouting: Submit "defense received" and comment to the webserver
This patch fills the last two pieces of data that the scouting app
is capable of collecting in to the SubmitDataScouting message.
The webserver does not yet handle them.
Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: I9c56fac58fe19da52bedeb0deaae74adc0194210
diff --git a/scouting/webserver/requests/messages/submit_data_scouting.fbs b/scouting/webserver/requests/messages/submit_data_scouting.fbs
index a9c44a2..e136e71 100644
--- a/scouting/webserver/requests/messages/submit_data_scouting.fbs
+++ b/scouting/webserver/requests/messages/submit_data_scouting.fbs
@@ -43,6 +43,10 @@
// The quadrant that the robot starts in for autonomous mode.
// Valid values are 1 through 4.
starting_quadrant: int (id:16);
+
+ // A general comment that scouts can use as a way to record non-numerical
+ // data if they need to.
+ comment: string (id:18);
}
root_type SubmitDataScouting;
diff --git a/scouting/www/entry/entry.component.ts b/scouting/www/entry/entry.component.ts
index 82819d8..33c856f 100644
--- a/scouting/www/entry/entry.component.ts
+++ b/scouting/www/entry/entry.component.ts
@@ -97,6 +97,7 @@
this.errorMessage = '';
const builder = new Builder();
+ const comment = builder.createString(this.comment);
SubmitDataScouting.startSubmitDataScouting(builder);
SubmitDataScouting.addTeam(builder, this.teamNumber);
SubmitDataScouting.addMatch(builder, this.matchNumber);
@@ -107,15 +108,15 @@
SubmitDataScouting.addUpperGoalTele(builder, this.teleUpperShotsMade);
SubmitDataScouting.addLowerGoalTele(builder, this.teleLowerShotsMade);
SubmitDataScouting.addDefenseRating(builder, this.defensePlayedScore);
+ SubmitDataScouting.addDefenseReceivedRating(builder, this.defensePlayedOnScore);
SubmitDataScouting.addAutoBall1(builder, this.ball1);
SubmitDataScouting.addAutoBall2(builder, this.ball2);
SubmitDataScouting.addAutoBall3(builder, this.ball3);
SubmitDataScouting.addAutoBall4(builder, this.ball4);
SubmitDataScouting.addAutoBall5(builder, this.ball5);
SubmitDataScouting.addStartingQuadrant(builder, this.quadrant);
- // TODO(ishan): Add support for the comment.
- // TODO(phil): Add support for defensePlayedOnScore.
SubmitDataScouting.addClimbLevel(builder, this.level);
+ SubmitDataScouting.addComment(builder, comment);
builder.finish(SubmitDataScouting.endSubmitDataScouting(builder));
const buffer = builder.asUint8Array();