Scouting: Update note scouting keywords
This change updates note scouting keywords per strategy's request.
Signed-off-by: Filip Kujawa <filip.j.kujawa@gmail.com>
Change-Id: I422bd96eca14a3a98a70d877941100717b59e573
diff --git a/scouting/db/db.go b/scouting/db/db.go
index ca1af9e..787a300 100644
--- a/scouting/db/db.go
+++ b/scouting/db/db.go
@@ -64,7 +64,7 @@
Notes string
GoodDriving bool
BadDriving bool
- SolidPickup bool
+ SolidPlacing bool
SketchyPlacing bool
GoodDefense bool
BadDefense bool
@@ -308,7 +308,7 @@
Notes: data.Notes,
GoodDriving: data.GoodDriving,
BadDriving: data.BadDriving,
- SolidPickup: data.SolidPickup,
+ SolidPlacing: data.SolidPlacing,
SketchyPlacing: data.SketchyPlacing,
GoodDefense: data.GoodDefense,
BadDefense: data.BadDefense,
diff --git a/scouting/db/db_test.go b/scouting/db/db_test.go
index b0d34d8..d632b4e 100644
--- a/scouting/db/db_test.go
+++ b/scouting/db/db_test.go
@@ -875,11 +875,11 @@
expected := []string{"Note 1", "Note 3"}
- err := fixture.db.AddNotes(NotesData{TeamNumber: 1234, Notes: "Note 1", GoodDriving: true, BadDriving: false, SolidPickup: false, SketchyPlacing: true, GoodDefense: false, BadDefense: true, EasilyDefended: true})
+ err := fixture.db.AddNotes(NotesData{TeamNumber: 1234, Notes: "Note 1", GoodDriving: true, BadDriving: false, SolidPlacing: false, SketchyPlacing: true, GoodDefense: false, BadDefense: true, EasilyDefended: true})
check(t, err, "Failed to add Note")
- err = fixture.db.AddNotes(NotesData{TeamNumber: 1235, Notes: "Note 2", GoodDriving: false, BadDriving: true, SolidPickup: false, SketchyPlacing: true, GoodDefense: false, BadDefense: false, EasilyDefended: false})
+ err = fixture.db.AddNotes(NotesData{TeamNumber: 1235, Notes: "Note 2", GoodDriving: false, BadDriving: true, SolidPlacing: false, SketchyPlacing: true, GoodDefense: false, BadDefense: false, EasilyDefended: false})
check(t, err, "Failed to add Note")
- err = fixture.db.AddNotes(NotesData{TeamNumber: 1234, Notes: "Note 3", GoodDriving: true, BadDriving: false, SolidPickup: false, SketchyPlacing: true, GoodDefense: true, BadDefense: false, EasilyDefended: true})
+ err = fixture.db.AddNotes(NotesData{TeamNumber: 1234, Notes: "Note 3", GoodDriving: true, BadDriving: false, SolidPlacing: false, SketchyPlacing: true, GoodDefense: true, BadDefense: false, EasilyDefended: true})
check(t, err, "Failed to add Note")
actual, err := fixture.db.QueryNotes(1234)
diff --git a/scouting/webserver/requests/debug/cli/cli_test.py b/scouting/webserver/requests/debug/cli/cli_test.py
index 0c2beab..b944564 100644
--- a/scouting/webserver/requests/debug/cli/cli_test.py
+++ b/scouting/webserver/requests/debug/cli/cli_test.py
@@ -105,7 +105,7 @@
"notes": "A very inspiring and useful comment",
"good_driving": True,
"bad_driving": False,
- "solid_pickup": False,
+ "solid_placing": False,
"sketchy_placing": True,
"good_defense": False,
"bad_defense": False,
@@ -128,7 +128,7 @@
Notes: (string) (len=35) "A very inspiring and useful comment",
GoodDriving: (bool) true,
BadDriving: (bool) false,
- SolidPickup: (bool) false,
+ SolidPlacing: (bool) false,
SketchyPlacing: (bool) true,
GoodDefense: (bool) false,
BadDefense: (bool) false,
diff --git a/scouting/webserver/requests/messages/request_all_notes_response.fbs b/scouting/webserver/requests/messages/request_all_notes_response.fbs
index 983ff62..70504d3 100644
--- a/scouting/webserver/requests/messages/request_all_notes_response.fbs
+++ b/scouting/webserver/requests/messages/request_all_notes_response.fbs
@@ -5,7 +5,7 @@
notes:string (id: 1);
good_driving:bool (id: 2);
bad_driving:bool (id: 3);
- solid_pickup:bool (id: 4);
+ solid_placing:bool (id: 4);
sketchy_placing:bool (id: 5);
good_defense:bool (id: 6);
bad_defense:bool (id: 7);
diff --git a/scouting/webserver/requests/messages/submit_notes.fbs b/scouting/webserver/requests/messages/submit_notes.fbs
index cee4dee..845a601 100644
--- a/scouting/webserver/requests/messages/submit_notes.fbs
+++ b/scouting/webserver/requests/messages/submit_notes.fbs
@@ -5,7 +5,7 @@
notes:string (id: 1);
good_driving:bool (id: 2);
bad_driving:bool (id: 3);
- solid_pickup:bool (id: 4);
+ solid_placing:bool (id: 4);
sketchy_placing:bool (id: 5);
good_defense:bool (id: 6);
bad_defense:bool (id: 7);
diff --git a/scouting/webserver/requests/requests.go b/scouting/webserver/requests/requests.go
index 8646a30..d1907c7 100644
--- a/scouting/webserver/requests/requests.go
+++ b/scouting/webserver/requests/requests.go
@@ -355,7 +355,7 @@
Notes: string(request.Notes()),
GoodDriving: bool(request.GoodDriving()),
BadDriving: bool(request.BadDriving()),
- SolidPickup: bool(request.SolidPickup()),
+ SolidPlacing: bool(request.SolidPlacing()),
SketchyPlacing: bool(request.SketchyPlacing()),
GoodDefense: bool(request.GoodDefense()),
BadDefense: bool(request.BadDefense()),
@@ -737,7 +737,7 @@
Notes: note.Notes,
GoodDriving: note.GoodDriving,
BadDriving: note.BadDriving,
- SolidPickup: note.SolidPickup,
+ SolidPlacing: note.SolidPlacing,
SketchyPlacing: note.SketchyPlacing,
GoodDefense: note.GoodDefense,
BadDefense: note.BadDefense,
diff --git a/scouting/webserver/requests/requests_test.go b/scouting/webserver/requests/requests_test.go
index ac644ea..8193b45 100644
--- a/scouting/webserver/requests/requests_test.go
+++ b/scouting/webserver/requests/requests_test.go
@@ -418,7 +418,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SolidPickup: true,
+ SolidPlacing: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -436,7 +436,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SolidPickup: true,
+ SolidPlacing: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -456,7 +456,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SolidPickup: true,
+ SolidPlacing: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -684,7 +684,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SolidPickup: true,
+ SolidPlacing: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -695,7 +695,7 @@
Notes: "More Notes",
GoodDriving: false,
BadDriving: false,
- SolidPickup: false,
+ SolidPlacing: false,
SketchyPlacing: true,
GoodDefense: false,
BadDefense: true,
@@ -723,7 +723,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SolidPickup: true,
+ SolidPlacing: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -734,7 +734,7 @@
Notes: "More Notes",
GoodDriving: false,
BadDriving: false,
- SolidPickup: false,
+ SolidPlacing: false,
SketchyPlacing: true,
GoodDefense: false,
BadDefense: true,
diff --git a/scouting/www/notes/notes.component.ts b/scouting/www/notes/notes.component.ts
index 5d1c4a2..2786717 100644
--- a/scouting/www/notes/notes.component.ts
+++ b/scouting/www/notes/notes.component.ts
@@ -40,7 +40,7 @@
interface Keywords {
goodDriving: boolean;
badDriving: boolean;
- solidPickup: boolean;
+ solidPlacing: boolean;
sketchyPlacing: boolean;
goodDefense: boolean;
badDefense: boolean;
@@ -56,7 +56,7 @@
const KEYWORD_CHECKBOX_LABELS = {
goodDriving: 'Good Driving',
badDriving: 'Bad Driving',
- solidPickup: 'Solid Pickup',
+ solidPlacing: 'Solid Placing',
sketchyPlacing: 'Sketchy Placing',
goodDefense: 'Good Defense',
badDefense: 'Bad Defense',
@@ -115,7 +115,7 @@
keywordsData: {
goodDriving: false,
badDriving: false,
- solidPickup: false,
+ solidPlacing: false,
sketchyPlacing: false,
goodDefense: false,
badDefense: false,
@@ -152,7 +152,7 @@
dataFb,
this.newData[i].keywordsData.goodDriving,
this.newData[i].keywordsData.badDriving,
- this.newData[i].keywordsData.solidPickup,
+ this.newData[i].keywordsData.solidPlacing,
this.newData[i].keywordsData.sketchyPlacing,
this.newData[i].keywordsData.goodDefense,
this.newData[i].keywordsData.badDefense,
diff --git a/scouting/www/view/view.component.ts b/scouting/www/view/view.component.ts
index f7d6ce8..561ae08 100644
--- a/scouting/www/view/view.component.ts
+++ b/scouting/www/view/view.component.ts
@@ -171,8 +171,8 @@
if (entry.badDriving()) {
parsedKeywords += 'Bad Driving ';
}
- if (entry.solidPickup()) {
- parsedKeywords += 'Solid Pickup ';
+ if (entry.solidPlacing()) {
+ parsedKeywords += 'Solid Placing ';
}
if (entry.sketchyPlacing()) {
parsedKeywords += 'Sketchy Placing ';