From 7d287a7c70c92fcb6b1469e8b99a210d43ca89c4 Mon Sep 17 00:00:00 2001
From: zandiac24 <brycefowlkes@gmail.com>
Date: Tue, 28 Jan 2025 18:25:27 -0500
Subject: [PATCH 1/9] Update structure.json

---
 scoutingapp/src/config/structure.json | 49 ++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/scoutingapp/src/config/structure.json b/scoutingapp/src/config/structure.json
index 52d6fa2..27639fb 100644
--- a/scoutingapp/src/config/structure.json
+++ b/scoutingapp/src/config/structure.json
@@ -74,24 +74,51 @@
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Auto Speaker Cycles",
+                "text": "Auto Coral L1 Cycles",
                 "placeholder": [
                     "0"
                 ],
-                "id": "AutoSpeaker"
+                "id": "AutoCoralL1"
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Auto Amp Cycles",
+                "text": "Auto Coral L2 Cycles",
                 "placeholder": [
                     "0"
                 ],
-                "id": "AutoAmp"
+                "id": "AutoCoralL2"
             },
             {
-                "type": "GenericToggle",
-                "text": "Did they intake from the centerline during auto?",
-                "id": "AutoCenterline"
+                "type": "IncrementNumberInput",
+                "text": "Auto Coral L3 Cycles",
+                "placehoder": [
+                    "0"
+                ],
+                "id": "AutoCoralL3"
+            },
+            {
+                "type": "IncrementNumberInput",
+                "text": "Auto Coral L4 Cycles",
+                "placehoder": [
+                    "0"
+                ],
+                "id": "AutoCoralL4"
+            },
+            {
+                "type": "IncrementNumberInput",
+                "text": "Auto Barge Cycles",
+                "placehoder": [
+                    "0"
+                ],
+                "id": "AutoBarge"
+            },
+            {
+                "type": "IncrementNumberInput",
+                "text": "Auto Processor Cycles",
+                "placehoder": [
+                    "0"
+                ],
+                "id": "AutoProcessor"
             },
             {
                 "type": "GenericToggle",
@@ -274,8 +301,12 @@
                 "Alliance",
                 "DriverStation",
                 "TeamNumber",
-                "AutoSpeaker",
-                "AutoAmp",
+                "AutoCoralL1",
+                "AutoCoralL2",
+                "AutoCoralL3",
+                "AutoCoralL4",
+                "AutoBarge",
+                "AutoProcessor",
                 "AutoCenterline",
                 "AutoLeave",
                 "AutoNotes",

From e579b0245d59d7cf67b4583f09b1325674fc1256 Mon Sep 17 00:00:00 2001
From: Ryan Lo <ytryanlo@gmail.com>
Date: Wed, 29 Jan 2025 21:09:07 -0500
Subject: [PATCH 2/9] added a teleop field

---
 scoutingapp/src/config/structure.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scoutingapp/src/config/structure.json b/scoutingapp/src/config/structure.json
index 52d6fa2..7c3b778 100644
--- a/scoutingapp/src/config/structure.json
+++ b/scoutingapp/src/config/structure.json
@@ -1,11 +1,11 @@
 [
     {
-        "name": "2024 Scouting App",
-        "description": "Team 4099: The Falcon's 2024 scouting data collection page",
+        "name": "2025 Scouting App",
+        "description": "Team 4099: The Falcon's 2025 scouting data collection page",
         "components": [
             {
                 "type": "GenericHeaderOne",
-                "text": "2024 Scouting App"
+                "text": "2025 Scouting App"
             },
             {
                 "type": "GenericHeaderTwo",
@@ -112,14 +112,14 @@
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Teleop Speaker Cycles",
+                "text": "Teleop Coral Level 1 Cycles",
                 "placeholder": [
                     "0"
                 ],
                 "options": [
                     "red"
                 ],
-                "id": "TeleopSpeaker"
+                "id": "TeleopCoralL1"
             },
             {
                 "type": "IncrementNumberInput",
@@ -279,7 +279,7 @@
                 "AutoCenterline",
                 "AutoLeave",
                 "AutoNotes",
-                "TeleopSpeaker",
+                "TeleopCoralL1",
                 "TeleopAmp",
                 "TeleopTrap",
                 "TeleopPassing",

From 9f116b7ddb4eb0794ec3f19e620edf309514b2b8 Mon Sep 17 00:00:00 2001
From: CodingMaster121 <67883747+CodingMaster121@users.noreply.github.com>
Date: Wed, 5 Feb 2025 22:48:39 -0500
Subject: [PATCH 3/9] Removed tippy field duplicate

---
 scoutingapp/src/config/structure.json | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/scoutingapp/src/config/structure.json b/scoutingapp/src/config/structure.json
index 81a17d8..f6291f5 100644
--- a/scoutingapp/src/config/structure.json
+++ b/scoutingapp/src/config/structure.json
@@ -209,18 +209,13 @@
                 "text": "Did they disable?",
                 "id": "Disabled"
             },
-            {
-                "type": "GenericToggle",
-                "text": "Can the robot easily tip over?",
-                "id": "Tippiness"
-            },
             {
             "type": "GenericDropdown",
                 "text": "How tippy was their robot?",
                 "options": [
-                    "Very tippy",
-                    "moderately tippy",
-                    "stable"
+                    "Very Tippy",
+                    "Moderatly Tippy",
+                    "Stable"
                 ],
                 "id": "StabilityRating"
             },

From c300cc0bbb9c2817e28798e77026f6fde1e0565b Mon Sep 17 00:00:00 2001
From: Ryan Lo <ytryanlo@gmail.com>
Date: Fri, 7 Feb 2025 20:27:52 -0500
Subject: [PATCH 4/9] made some minor changes to auto

---
 .../inputs/IncrementNumberInput.tsx           |  2 +-
 scoutingapp/src/config/structure.json         | 28 +++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/scoutingapp/src/components/inputs/IncrementNumberInput.tsx b/scoutingapp/src/components/inputs/IncrementNumberInput.tsx
index 5793dd7..da2d55b 100644
--- a/scoutingapp/src/components/inputs/IncrementNumberInput.tsx
+++ b/scoutingapp/src/components/inputs/IncrementNumberInput.tsx
@@ -28,7 +28,7 @@ function IncrementNumberInput(props: ComponentSetup) {
                 >
                     -
                 </button>
-                <div className={`flex w-1/3 h-full text-2xl float-left items-center ${color == "red" ? "bg-red-400" : color == "yellow" ? "bg-amber-300" : color == "blue" ? "bg-blue-500" : color == "green" ? "bg-green-400" : "bg-white"}`}>
+                <div className={`flex w-1/3 h-full text-2xl float-left items-center ${color == "red" ? "bg-red-400" : color == "yellow" ? "bg-amber-300" : color == "blue" ? "bg-blue-500" : color == "green" ? "bg-green-400" : color == "purple" ? "bg-purple-400" : color == "orange" ? "bg-orange-400" : "bg-white"}`}>
                     <p className={"text-center w-full"}>{counter}</p>
                 </div>
                 <button
diff --git a/scoutingapp/src/config/structure.json b/scoutingapp/src/config/structure.json
index 27639fb..01e25e9 100644
--- a/scoutingapp/src/config/structure.json
+++ b/scoutingapp/src/config/structure.json
@@ -78,6 +78,9 @@
                 "placeholder": [
                     "0"
                 ],
+                "options": [
+                    "red"
+                ],
                 "id": "AutoCoralL1"
             },
             {
@@ -86,43 +89,58 @@
                 "placeholder": [
                     "0"
                 ],
+                "options": [
+                    "orange"
+                ],
                 "id": "AutoCoralL2"
             },
             {
                 "type": "IncrementNumberInput",
                 "text": "Auto Coral L3 Cycles",
-                "placehoder": [
+                "placeholder": [
                     "0"
                 ],
+                "options": [
+                    "yellow"
+                ],
                 "id": "AutoCoralL3"
             },
             {
                 "type": "IncrementNumberInput",
                 "text": "Auto Coral L4 Cycles",
-                "placehoder": [
+                "placeholder": [
                     "0"
                 ],
+                "options": [
+                    "green"
+                ],
                 "id": "AutoCoralL4"
             },
             {
                 "type": "IncrementNumberInput",
                 "text": "Auto Barge Cycles",
-                "placehoder": [
+                "placeholder": [
                     "0"
                 ],
+                "options": [
+                    "blue"
+                ],
                 "id": "AutoBarge"
             },
             {
                 "type": "IncrementNumberInput",
                 "text": "Auto Processor Cycles",
-                "placehoder": [
+                "placeholder": [
                     "0"
                 ],
+                "options": [
+                    "purple"
+                ],
                 "id": "AutoProcessor"
             },
             {
                 "type": "GenericToggle",
-                "text": "Did they leave the starting zone (white line)?",
+                "text": "Did they leave the starting zone (black line)?",
                 "id": "AutoLeave"
             },
             {

From 940078943d9639c7deb2517b68bc80faa3873a04 Mon Sep 17 00:00:00 2001
From: Ryan Lo <ytryanlo@gmail.com>
Date: Fri, 7 Feb 2025 20:35:22 -0500
Subject: [PATCH 5/9] finished adding teleop fields

---
 .../inputs/IncrementNumberInput.tsx           |  2 +-
 scoutingapp/src/config/structure.json         | 44 ++++++++++++++-----
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/scoutingapp/src/components/inputs/IncrementNumberInput.tsx b/scoutingapp/src/components/inputs/IncrementNumberInput.tsx
index 5793dd7..da2d55b 100644
--- a/scoutingapp/src/components/inputs/IncrementNumberInput.tsx
+++ b/scoutingapp/src/components/inputs/IncrementNumberInput.tsx
@@ -28,7 +28,7 @@ function IncrementNumberInput(props: ComponentSetup) {
                 >
                     -
                 </button>
-                <div className={`flex w-1/3 h-full text-2xl float-left items-center ${color == "red" ? "bg-red-400" : color == "yellow" ? "bg-amber-300" : color == "blue" ? "bg-blue-500" : color == "green" ? "bg-green-400" : "bg-white"}`}>
+                <div className={`flex w-1/3 h-full text-2xl float-left items-center ${color == "red" ? "bg-red-400" : color == "yellow" ? "bg-amber-300" : color == "blue" ? "bg-blue-500" : color == "green" ? "bg-green-400" : color == "purple" ? "bg-purple-400" : color == "orange" ? "bg-orange-400" : "bg-white"}`}>
                     <p className={"text-center w-full"}>{counter}</p>
                 </div>
                 <button
diff --git a/scoutingapp/src/config/structure.json b/scoutingapp/src/config/structure.json
index 7c3b778..4f62726 100644
--- a/scoutingapp/src/config/structure.json
+++ b/scoutingapp/src/config/structure.json
@@ -112,7 +112,7 @@
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Teleop Coral Level 1 Cycles",
+                "text": "Teleop Coral L1 Cycles",
                 "placeholder": [
                     "0"
                 ],
@@ -123,36 +123,58 @@
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Teleop Amp Cycles",
+                "text": "Teleop Coral L2 Cycles",
+                "placeholder": [
+                    "0"
+                ],
+                "options": [
+                    "orange"
+                ],
+                "id": "TeleopCoralL2"
+            },
+            {
+                "type": "IncrementNumberInput",
+                "text": "Teleop Coral L3 Cycles",
                 "placeholder": [
                     "0"
                 ],
                 "options": [
                     "yellow"
                 ],
-                "id": "TeleopAmp"
+                "id": "TeleopCoralL3"
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Teleop/Endgame Trap Cycles",
+                "text": "Teleop Coral L4 Cycles",
                 "placeholder": [
                     "0"
                 ],
                 "options": [
                     "green"
                 ],
-                "id": "TeleopTrap"
+                "id": "TeleopCoralL4"
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Teleop/Endgame Passing Cycles",
+                "text": "Teleop Barge Cycles",
                 "placeholder": [
                     "0"
                 ],
                 "options": [
                     "blue"
                 ],
-                "id": "TeleopPassing"
+                "id": "TeleopAlgaeBarge"
+            },
+            {
+                "type": "IncrementNumberInput",
+                "text": "Teleop Processor Cycles",
+                "placeholder": [
+                    "0"
+                ],
+                "options": [
+                    "purple"
+                ],
+                "id": "TeleopAlgaeProcessor"
             },
             {
                 "type": "GenericTextArea",
@@ -280,9 +302,11 @@
                 "AutoLeave",
                 "AutoNotes",
                 "TeleopCoralL1",
-                "TeleopAmp",
-                "TeleopTrap",
-                "TeleopPassing",
+                "TeleopCoralL2",
+                "TeleopCoralL3",
+                "TeleopCoralL4",
+                "TeleopAlgaeBarge",
+                "TeleopAlgaeProcessor",
                 "TeleopNotes",
                 "Parked",
                 "ClimbStatus",

From 872b9e6bbdc6a4619eeefccfb03b07534c2a6bc8 Mon Sep 17 00:00:00 2001
From: Ryan Lo <ytryanlo@gmail.com>
Date: Fri, 7 Feb 2025 21:56:09 -0500
Subject: [PATCH 6/9] updated config.json

---
 falconscoutcore/config.json | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/falconscoutcore/config.json b/falconscoutcore/config.json
index 947050f..c88a6e2 100644
--- a/falconscoutcore/config.json
+++ b/falconscoutcore/config.json
@@ -7,26 +7,31 @@
             "Alliance",
             "DriverStation",
             "TeamNumber",
-            "AutoSpeaker",
-            "AutoAmp",
-            "AutoLeave",
+            "AutoCoralL1",
+            "AutoCoralL2",
+            "AutoCoralL3",
+            "AutoCoralL4",
+            "AutoBarge",
+            "AutoProcessor",
             "AutoCenterline",
+            "AutoLeave",
             "AutoNotes",
-            "TeleopSpeaker",
-            "TeleopAmp",
-            "TeleopTrap",
-            "TeleopPassing",
+            "TeleopCoralL1",
+            "TeleopCoralL2",
+            "TeleopCoralL3",
+            "TeleopCoralL4",
+            "TeleopAlgaeBarge",
+            "TeleopAlgaeProcessor",
             "TeleopNotes",
             "Parked",
             "ClimbStatus",
-            "Harmonized",
             "ClimbSpeed",
             "EndgameNotes",
             "Disabled",
+            "StabilityRating",
+            "RobotStyleType",
             "DriverRating",
-            "DefenseTime",
-            "DefenseSkill",
-            "CounterDefenseSkill",
+            "IntakeDefenseRating",
             "RatingNotes"
         ],
         "qualitative_data_labels": [
@@ -38,11 +43,8 @@
             "AutoDrivingSkills",
             "AutoGeneralNotes",
             "TeleopIntakeLocation",
-            "SpeakerAccuracy",
-            "AmpAccuracy",
-            "AligningSpeed",
-            "ScoringSpeed",
-            "IntakingSpeed",
+            "TeleopGeneralNotes",
+            "ClimbAlignmentSpeed",
             "EndgameGeneralNotes"
         ],
         "json_file": "./data/2024cur_match_data.json",

From e5c6131c96c53b874671e13ec5bdd169eea428f0 Mon Sep 17 00:00:00 2001
From: Ryan Lo <ytryanlo@gmail.com>
Date: Fri, 7 Feb 2025 22:12:25 -0500
Subject: [PATCH 7/9] updated coral and algae cycle fields

---
 scoutingapp/src/config/structure.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/scoutingapp/src/config/structure.json b/scoutingapp/src/config/structure.json
index 266df13..e1cb412 100644
--- a/scoutingapp/src/config/structure.json
+++ b/scoutingapp/src/config/structure.json
@@ -79,7 +79,7 @@
                     "0"
                 ],
                 "options": [
-                    "red"
+                    "purple"
                 ],
                 "id": "AutoCoralL1"
             },
@@ -90,7 +90,7 @@
                     "0"
                 ],
                 "options": [
-                    "orange"
+                    "purple"
                 ],
                 "id": "AutoCoralL2"
             },
@@ -101,7 +101,7 @@
                     "0"
                 ],
                 "options": [
-                    "yellow"
+                    "purple"
                 ],
                 "id": "AutoCoralL3"
             },
@@ -112,7 +112,7 @@
                     "0"
                 ],
                 "options": [
-                    "green"
+                    "purple"
                 ],
                 "id": "AutoCoralL4"
             },
@@ -123,7 +123,7 @@
                     "0"
                 ],
                 "options": [
-                    "blue"
+                    "green"
                 ],
                 "id": "AutoBarge"
             },
@@ -134,7 +134,7 @@
                     "0"
                 ],
                 "options": [
-                    "purple"
+                    "green"
                 ],
                 "id": "AutoProcessor"
             },
@@ -162,7 +162,7 @@
                     "0"
                 ],
                 "options": [
-                    "red"
+                    "purple"
                 ],
                 "id": "TeleopCoralL1"
             },
@@ -173,7 +173,7 @@
                     "0"
                 ],
                 "options": [
-                    "orange"
+                    "purple"
                 ],
                 "id": "TeleopCoralL2"
             },
@@ -184,7 +184,7 @@
                     "0"
                 ],
                 "options": [
-                    "yellow"
+                    "purple"
                 ],
                 "id": "TeleopCoralL3"
             },
@@ -195,7 +195,7 @@
                     "0"
                 ],
                 "options": [
-                    "green"
+                    "purple"
                 ],
                 "id": "TeleopCoralL4"
             },
@@ -206,7 +206,7 @@
                     "0"
                 ],
                 "options": [
-                    "blue"
+                    "green"
                 ],
                 "id": "TeleopAlgaeBarge"
             },
@@ -217,7 +217,7 @@
                     "0"
                 ],
                 "options": [
-                    "purple"
+                    "green"
                 ],
                 "id": "TeleopAlgaeProcessor"
             },

From cb85e156fb48637b83f991e2f6b6487c367457e9 Mon Sep 17 00:00:00 2001
From: Ryan Lo <ytryanlo@gmail.com>
Date: Sat, 8 Feb 2025 00:34:59 -0500
Subject: [PATCH 8/9] added additional auto fields

---
 scoutingapp/src/config/structure.json | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/scoutingapp/src/config/structure.json b/scoutingapp/src/config/structure.json
index e1cb412..f66c919 100644
--- a/scoutingapp/src/config/structure.json
+++ b/scoutingapp/src/config/structure.json
@@ -70,7 +70,26 @@
             },
             {
                 "type": "GenericHeaderTwo",
-                "text": "Auto Game Pieces"
+                "text": "Auto"
+            },
+            {
+                "type": "GenericDropdown",
+                "text": "Robot Starting Position",
+                "options": [
+                    "Far Coral Station",
+                    "Middle",
+                    "Close Coral Station"
+                ],
+                "id": "StartingPosition"
+            },
+            {
+                "type": "GenericCheckboxSelect",
+                "text": "Auto Scoring Position",
+                "options": [
+                    "Far Coral Station",
+                    "Close Coral Station"
+                ],
+                "id": "ScoringPosition"
             },
             {
                 "type": "IncrementNumberInput",
@@ -153,7 +172,7 @@
             },
             {
                 "type": "GenericHeaderTwo",
-                "text": "Teleop Game Pieces"
+                "text": "Teleop"
             },
             {
                 "type": "IncrementNumberInput",
@@ -339,6 +358,8 @@
                 "Alliance",
                 "DriverStation",
                 "TeamNumber",
+                "StartingPosition",
+                "ScoringPosition",
                 "AutoCoralL1",
                 "AutoCoralL2",
                 "AutoCoralL3",

From 57cbd0ff1b5fccd6860c670ec6c73df645171034 Mon Sep 17 00:00:00 2001
From: Ryan Lo <ytryanlo@gmail.com>
Date: Sat, 8 Feb 2025 00:39:09 -0500
Subject: [PATCH 9/9] Reordered the auto fields

---
 scoutingapp/src/config/structure.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scoutingapp/src/config/structure.json b/scoutingapp/src/config/structure.json
index f66c919..67bd6b6 100644
--- a/scoutingapp/src/config/structure.json
+++ b/scoutingapp/src/config/structure.json
@@ -82,14 +82,19 @@
                 ],
                 "id": "StartingPosition"
             },
+            {
+                "type": "GenericToggle",
+                "text": "Did they leave the starting zone (black line)?",
+                "id": "AutoLeave"
+            },
             {
                 "type": "GenericCheckboxSelect",
-                "text": "Auto Scoring Position",
+                "text": "Auto Scoring Side",
                 "options": [
                     "Far Coral Station",
                     "Close Coral Station"
                 ],
-                "id": "ScoringPosition"
+                "id": "ScoringSide"
             },
             {
                 "type": "IncrementNumberInput",
@@ -157,11 +162,6 @@
                 ],
                 "id": "AutoProcessor"
             },
-            {
-                "type": "GenericToggle",
-                "text": "Did they leave the starting zone (black line)?",
-                "id": "AutoLeave"
-            },
             {
                 "type": "GenericTextArea",
                 "text": "Auto Notes",
@@ -359,7 +359,8 @@
                 "DriverStation",
                 "TeamNumber",
                 "StartingPosition",
-                "ScoringPosition",
+                "AutoLeave",
+                "ScoringSide",
                 "AutoCoralL1",
                 "AutoCoralL2",
                 "AutoCoralL3",
@@ -367,7 +368,6 @@
                 "AutoBarge",
                 "AutoProcessor",
                 "AutoCenterline",
-                "AutoLeave",
                 "AutoNotes",
                 "TeleopCoralL1",
                 "TeleopCoralL2",