From ebf279f15036833ffef8fafa31cb4fe0114f4b91 Mon Sep 17 00:00:00 2001 From: chiming wang Date: Wed, 6 Mar 2024 01:03:19 -0500 Subject: [PATCH] removed piecesScored plusminus button and made it so that piecesScored is automatically calculated on backend by adding scoredSpeaker, scoredAmp, and scoredWhileAmped --- lib/parts/views/scouting.dart | 2 ++ lib/user/models/team_bloc.dart | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/parts/views/scouting.dart b/lib/parts/views/scouting.dart index 7afe040..23e3324 100644 --- a/lib/parts/views/scouting.dart +++ b/lib/parts/views/scouting.dart @@ -506,6 +506,7 @@ class _ScoutingViewState extends State title: "Tele-op" ), child: form_col([ + /* form_label("Pieces Scored", child: PlusMinus( initialValue: context @@ -522,6 +523,7 @@ class _ScoutingViewState extends State .add(TeleOpUpdateEvent()); }, )), + */ form_label("Plays Defense", child: BasicToggleSwitch( initialValue: context diff --git a/lib/user/models/team_bloc.dart b/lib/user/models/team_bloc.dart index bfbe9fa..84c41cc 100644 --- a/lib/user/models/team_bloc.dart +++ b/lib/user/models/team_bloc.dart @@ -171,7 +171,7 @@ class TeleOpInfo extends ScoutingInfo scoredSpeaker: scoredSpeaker, missedSpeaker: missedSpeaker, scoredAmp: scoredAmp, - piecesScored: piecesScored, + piecesScored: /*piecesScored*/ scoredSpeaker + scoredAmp + scoredWhileAmped, missedAmp: missedAmp, scoredWhileAmped: scoredWhileAmped, driverRating: driverRating); @@ -183,7 +183,7 @@ class TeleOpInfo extends ScoutingInfo "scoredSpeaker": scoredSpeaker, "missedSpeaker": missedSpeaker, "scoredAmp": scoredAmp, - "piecesScored": piecesScored, + "piecesScored": /*piecesScored*/ scoredSpeaker + scoredAmp + scoredWhileAmped, "missedAmp": missedAmp, "scoredWhileAmped": scoredWhileAmped, "driverRating": driverRating @@ -208,7 +208,7 @@ class TeleOpInfo extends ScoutingInfo String toCompatibleFormat() { return jsonEncode({ "def": playsDefense, - "pieces": piecesScored, + "pieces": /*piecesScored*/ scoredSpeaker + scoredAmp + scoredWhileAmped, "undSpker": underStage, "spker": scoredSpeaker, "missSpker": missedSpeaker,