Merge "Scouting: Fix sketchy pickup bug"
diff --git a/scouting/db/db.go b/scouting/db/db.go
index 98d8d71..1ea8310 100644
--- a/scouting/db/db.go
+++ b/scouting/db/db.go
@@ -63,7 +63,7 @@
Notes string
GoodDriving bool
BadDriving bool
- SketchyPickup bool
+ SolidPickup bool
SketchyPlacing bool
GoodDefense bool
BadDefense bool
@@ -307,7 +307,7 @@
Notes: data.Notes,
GoodDriving: data.GoodDriving,
BadDriving: data.BadDriving,
- SketchyPickup: data.SketchyPickup,
+ SolidPickup: data.SolidPickup,
SketchyPlacing: data.SketchyPlacing,
GoodDefense: data.GoodDefense,
BadDefense: data.BadDefense,
diff --git a/scouting/db/db_test.go b/scouting/db/db_test.go
index bd2bb68..2f9196e 100644
--- a/scouting/db/db_test.go
+++ b/scouting/db/db_test.go
@@ -857,11 +857,11 @@
expected := []string{"Note 1", "Note 3"}
- err := fixture.db.AddNotes(NotesData{TeamNumber: 1234, Notes: "Note 1", GoodDriving: true, BadDriving: false, SketchyPickup: false, SketchyPlacing: true, GoodDefense: false, BadDefense: true, EasilyDefended: true})
+ err := fixture.db.AddNotes(NotesData{TeamNumber: 1234, Notes: "Note 1", GoodDriving: true, BadDriving: false, SolidPickup: 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, SketchyPickup: false, SketchyPlacing: true, GoodDefense: false, BadDefense: false, EasilyDefended: false})
+ err = fixture.db.AddNotes(NotesData{TeamNumber: 1235, Notes: "Note 2", GoodDriving: false, BadDriving: true, SolidPickup: 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, SketchyPickup: false, SketchyPlacing: true, GoodDefense: true, BadDefense: false, EasilyDefended: true})
+ err = fixture.db.AddNotes(NotesData{TeamNumber: 1234, Notes: "Note 3", GoodDriving: true, BadDriving: false, SolidPickup: 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 51308d7..0c2beab 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,
- "sketchy_pickup": False,
+ "solid_pickup": 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,
- SketchyPickup: (bool) false,
+ SolidPickup: (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 78e662d..983ff62 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);
- sketchy_pickup:bool (id: 4);
+ solid_pickup: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 27ed472..cee4dee 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);
- sketchy_pickup:bool (id: 4);
+ solid_pickup: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 19f63b8..bb40ecf 100644
--- a/scouting/webserver/requests/requests.go
+++ b/scouting/webserver/requests/requests.go
@@ -353,7 +353,7 @@
Notes: string(request.Notes()),
GoodDriving: bool(request.GoodDriving()),
BadDriving: bool(request.BadDriving()),
- SketchyPickup: bool(request.SketchyPickup()),
+ SolidPickup: bool(request.SolidPickup()),
SketchyPlacing: bool(request.SketchyPlacing()),
GoodDefense: bool(request.GoodDefense()),
BadDefense: bool(request.BadDefense()),
@@ -727,7 +727,7 @@
Notes: note.Notes,
GoodDriving: note.GoodDriving,
BadDriving: note.BadDriving,
- SketchyPickup: note.SketchyPickup,
+ SolidPickup: note.SolidPickup,
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 409d61c..fb0be5c 100644
--- a/scouting/webserver/requests/requests_test.go
+++ b/scouting/webserver/requests/requests_test.go
@@ -409,7 +409,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SketchyPickup: true,
+ SolidPickup: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -427,7 +427,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SketchyPickup: true,
+ SolidPickup: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -447,7 +447,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SketchyPickup: true,
+ SolidPickup: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -675,7 +675,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SketchyPickup: true,
+ SolidPickup: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -686,7 +686,7 @@
Notes: "More Notes",
GoodDriving: false,
BadDriving: false,
- SketchyPickup: false,
+ SolidPickup: false,
SketchyPlacing: true,
GoodDefense: false,
BadDefense: true,
@@ -714,7 +714,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SketchyPickup: true,
+ SolidPickup: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -725,7 +725,7 @@
Notes: "More Notes",
GoodDriving: false,
BadDriving: false,
- SketchyPickup: false,
+ SolidPickup: false,
SketchyPlacing: true,
GoodDefense: false,
BadDefense: true,
diff --git a/scouting/www/notes/notes.component.ts b/scouting/www/notes/notes.component.ts
index 94a1586..5d1e8f2 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;
- sketchyPickup: boolean;
+ solidPickup: boolean;
sketchyPlacing: boolean;
goodDefense: boolean;
badDefense: boolean;
@@ -56,7 +56,7 @@
const KEYWORD_CHECKBOX_LABELS = {
goodDriving: 'Good Driving',
badDriving: 'Bad Driving',
- sketchyPickup: 'Solid Pickup',
+ solidPickup: 'Solid Pickup',
sketchyPlacing: 'Sketchy Placing',
goodDefense: 'Good Defense',
badDefense: 'Bad Defense',
@@ -115,7 +115,7 @@
keywordsData: {
goodDriving: false,
badDriving: false,
- sketchyPickup: false,
+ solidPickup: 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.sketchyPickup,
+ this.newData[i].keywordsData.solidPickup,
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 f5b4d6a..f7d6ce8 100644
--- a/scouting/www/view/view.component.ts
+++ b/scouting/www/view/view.component.ts
@@ -171,11 +171,11 @@
if (entry.badDriving()) {
parsedKeywords += 'Bad Driving ';
}
- if (entry.sketchyPickup()) {
- parsedKeywords += 'Sketchy Pickup ';
+ if (entry.solidPickup()) {
+ parsedKeywords += 'Solid Pickup ';
}
if (entry.sketchyPlacing()) {
- parsedKeywords += 'Sketchy Pickup ';
+ parsedKeywords += 'Sketchy Placing ';
}
if (entry.goodDefense()) {
parsedKeywords += 'Good Defense ';