Scouting: Fix sketchy pickup bug
Note scouts were seeing a solid pickup label but the app was submitting
sketchy pickups instead. Strategy team wants to measure solid pickups, this change
fixes the bug so that the solid pickup keyword is actually submitted.
Signed-off-by: Filip Kujawa <filip.j.kujawa@gmail.com>
Change-Id: I7578b4ddb64f176409b0e666e44675239eb25475
diff --git a/scouting/db/db.go b/scouting/db/db.go
index 3791596..b879cab 100644
--- a/scouting/db/db.go
+++ b/scouting/db/db.go
@@ -102,7 +102,7 @@
Notes string
GoodDriving bool
BadDriving bool
- SketchyPickup bool
+ SolidPickup bool
SketchyPlacing bool
GoodDefense bool
BadDefense bool
@@ -412,7 +412,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 72c5f86..267cfb9 100644
--- a/scouting/db/db_test.go
+++ b/scouting/db/db_test.go
@@ -1185,11 +1185,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 4763058..2fc4d6c 100644
--- a/scouting/webserver/requests/debug/cli/cli_test.py
+++ b/scouting/webserver/requests/debug/cli/cli_test.py
@@ -188,7 +188,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,
@@ -211,7 +211,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 4f12a4f..a785e18 100644
--- a/scouting/webserver/requests/requests.go
+++ b/scouting/webserver/requests/requests.go
@@ -482,7 +482,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()),
@@ -856,7 +856,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 d2d5acc..7aa670d 100644
--- a/scouting/webserver/requests/requests_test.go
+++ b/scouting/webserver/requests/requests_test.go
@@ -565,7 +565,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SketchyPickup: true,
+ SolidPickup: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -583,7 +583,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SketchyPickup: true,
+ SolidPickup: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -603,7 +603,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SketchyPickup: true,
+ SolidPickup: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -831,7 +831,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SketchyPickup: true,
+ SolidPickup: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -842,7 +842,7 @@
Notes: "More Notes",
GoodDriving: false,
BadDriving: false,
- SketchyPickup: false,
+ SolidPickup: false,
SketchyPlacing: true,
GoodDefense: false,
BadDefense: true,
@@ -870,7 +870,7 @@
Notes: "Notes",
GoodDriving: true,
BadDriving: false,
- SketchyPickup: true,
+ SolidPickup: true,
SketchyPlacing: false,
GoodDefense: true,
BadDefense: false,
@@ -881,7 +881,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 f4a55a1..5ae1f76 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 ';