Update Notes
Update Notes to include Match Number, Set Number, Comp Level, and No Show
Signed-off-by: Emily Markova <emily.markova@gmail.com>
Change-Id: I26550c0ea32b81bb8124d326cf1bef2bf912886a
diff --git a/scouting/webserver/requests/debug/cli/cli_test.py b/scouting/webserver/requests/debug/cli/cli_test.py
index d11b506..cfdcd03 100644
--- a/scouting/webserver/requests/debug/cli/cli_test.py
+++ b/scouting/webserver/requests/debug/cli/cli_test.py
@@ -107,9 +107,10 @@
"bad_driving": False,
"solid_placing": False,
"sketchy_placing": True,
- "good_defense": False,
- "bad_defense": False,
- "easily_defended": False,
+ "no_show": False,
+ "match_number": 3,
+ "set_number": 1,
+ "comp_level": "qm",
})
exit_code, _, stderr = run_debug_cli(["-submitNotes", json_path])
self.assertEqual(exit_code, 0, stderr)
@@ -132,7 +133,11 @@
SketchyPlacing: (bool) true,
GoodDefense: (bool) false,
BadDefense: (bool) false,
- EasilyDefended: (bool) false
+ EasilyDefended: (bool) false,
+ NoShow: (bool) false,
+ MatchNumber: (int32) 3,
+ SetNumber: (int32) 1,
+ CompLevel: (string) (len=2) "qm"
}"""), stdout)
def test_submit_and_request_driver_ranking(self):
diff --git a/scouting/webserver/requests/messages/request_all_notes_response.fbs b/scouting/webserver/requests/messages/request_all_notes_response.fbs
index 1afdf25..cd9b702 100644
--- a/scouting/webserver/requests/messages/request_all_notes_response.fbs
+++ b/scouting/webserver/requests/messages/request_all_notes_response.fbs
@@ -10,6 +10,10 @@
good_defense:bool (id: 6);
bad_defense:bool (id: 7);
easily_defended:bool (id: 8);
+ no_show:bool (id: 9);
+ match_number:int (id: 10);
+ set_number:int (id: 11);
+ comp_level:string (id: 12);
}
table RequestAllNotesResponse {
diff --git a/scouting/webserver/requests/messages/submit_notes.fbs b/scouting/webserver/requests/messages/submit_notes.fbs
index 332b612..64226bc 100644
--- a/scouting/webserver/requests/messages/submit_notes.fbs
+++ b/scouting/webserver/requests/messages/submit_notes.fbs
@@ -10,6 +10,10 @@
good_defense:bool (id: 6);
bad_defense:bool (id: 7);
easily_defended:bool (id: 8);
+ no_show:bool (id: 9);
+ match_number:int (id: 10);
+ set_number:int (id: 11);
+ comp_level:string (id: 12);
}
root_type SubmitNotes;
diff --git a/scouting/webserver/requests/requests.go b/scouting/webserver/requests/requests.go
index 7d6e98e..1536093 100644
--- a/scouting/webserver/requests/requests.go
+++ b/scouting/webserver/requests/requests.go
@@ -398,6 +398,10 @@
GoodDefense: bool(request.GoodDefense()),
BadDefense: bool(request.BadDefense()),
EasilyDefended: bool(request.EasilyDefended()),
+ NoShow: bool(request.NoShow()),
+ MatchNumber: request.MatchNumber(),
+ SetNumber: request.SetNumber(),
+ CompLevel: string(request.CompLevel()),
})
if err != nil {
respondWithError(w, http.StatusInternalServerError, fmt.Sprintf("Failed to insert notes: %v", err))
@@ -1060,6 +1064,10 @@
GoodDefense: note.GoodDefense,
BadDefense: note.BadDefense,
EasilyDefended: note.EasilyDefended,
+ NoShow: note.NoShow,
+ MatchNumber: note.MatchNumber,
+ CompLevel: note.CompLevel,
+ SetNumber: note.SetNumber,
})
}
diff --git a/scouting/webserver/requests/requests_test.go b/scouting/webserver/requests/requests_test.go
index 26fad0f..6968346 100644
--- a/scouting/webserver/requests/requests_test.go
+++ b/scouting/webserver/requests/requests_test.go
@@ -696,6 +696,10 @@
GoodDefense: true,
BadDefense: false,
EasilyDefended: true,
+ NoShow: false,
+ MatchNumber: 4,
+ CompLevel: "qm",
+ SetNumber: 1,
}).Pack(builder))
_, err := debug.SubmitNotes("http://localhost:8080", builder.FinishedBytes())
@@ -714,6 +718,10 @@
GoodDefense: true,
BadDefense: false,
EasilyDefended: true,
+ NoShow: false,
+ MatchNumber: 4,
+ CompLevel: "qm",
+ SetNumber: 1,
},
}
@@ -734,6 +742,10 @@
GoodDefense: true,
BadDefense: false,
EasilyDefended: true,
+ NoShow: false,
+ MatchNumber: 4,
+ CompLevel: "qm",
+ SetNumber: 1,
}},
}
scoutingServer := server.NewScoutingServer()
@@ -1098,6 +1110,10 @@
GoodDefense: true,
BadDefense: false,
EasilyDefended: false,
+ NoShow: false,
+ MatchNumber: 4,
+ CompLevel: "qm",
+ SetNumber: 1,
},
{
TeamNumber: "972",
@@ -1109,6 +1125,10 @@
GoodDefense: false,
BadDefense: true,
EasilyDefended: false,
+ NoShow: false,
+ MatchNumber: 1,
+ CompLevel: "qm",
+ SetNumber: 2,
},
},
}
@@ -1137,6 +1157,10 @@
GoodDefense: true,
BadDefense: false,
EasilyDefended: false,
+ NoShow: false,
+ MatchNumber: 4,
+ CompLevel: "qm",
+ SetNumber: 1,
},
{
Team: "972",
@@ -1148,6 +1172,10 @@
GoodDefense: false,
BadDefense: true,
EasilyDefended: false,
+ NoShow: false,
+ MatchNumber: 1,
+ CompLevel: "qm",
+ SetNumber: 2,
},
},
}