Sad Times

SaberRobotics2506 · Apr 21, 2022 · faa932c · faa932c
1 parent 703a4c3
commit faa932c
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 61 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/src/main/java/com/ibxcodecat/frc_scouting/DataEntryActivity.kt b/app/src/main/java/com/ibxcodecat/frc_scouting/DataEntryActivity.kt
@@ -187,7 +187,7 @@ class DataEntryActivity : AppCompatActivity() {
                     teamNumber.selectedItem.toString().toInt(),
                     matchNumber.selectedItemPosition,
                     scoutedBy.text.toString(),
-                    regionalToggle.text.toString(),
+                    "Houston",
                     taxiToggle.isChecked,
                     score.text.toString().toInt(),
                     comments.text.toString(),

diff --git a/app/src/main/res/layout/activity_data_entry.xml b/app/src/main/res/layout/activity_data_entry.xml
@@ -281,8 +281,8 @@
         android:layout_marginTop="16dp"
         android:checked="true"
         android:textColor="#455A64"
-        android:textOff="@string/regionalOffText"
-        android:textOn="@string/regionalOnText"
+        android:textOff="I still do nothing"
+        android:textOn="click me for nothing"
         app:layout_constraintStart_toEndOf="@+id/verticalDivider"
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="TextContrastCheck" />

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -9,49 +9,82 @@
 
     <string-array name="teams">
         <item>Team #</item>
-        <item>93</item>
-        <item>537</item>
-        <item>706</item>
-        <item>930</item>
-        <item>1091</item>
-        <item>1259</item>
-        <item>1306</item>
-        <item>1675</item>
-        <item>1714</item>
+        <item>86</item>
+        <item>88</item>
+        <item>118</item>
+        <item>254</item>
+        <item>316</item>
+        <item>364</item>
+        <item>401</item>
+        <item>498</item>
+        <item>599</item>
+        <item>694</item>
+        <item>846</item>
+        <item>857</item>
+        <item>1023</item>
+        <item>1506</item>
+        <item>1619</item>
+        <item>1629</item>
+        <item>1731</item>
         <item>1732</item>
-        <item>1739</item>
-        <item>1792</item>
-        <item>2062</item>
-        <item>2077</item>
-        <item>2194</item>
-        <item>2202</item>
+        <item>1745</item>
+        <item>1756</item>
+        <item>1771</item>
+        <item>1816</item>
+        <item>1828</item>
+        <item>1868</item>
+        <item>1914</item>
+        <item>1918</item>
+        <item>2147</item>
+        <item>2168</item>
+        <item>2438</item>
+        <item>2481</item>
         <item>2506</item>
-        <item>2574</item>
-        <item>2830</item>
-        <item>3197</item>
-        <item>3418</item>
-        <item>3596</item>
+        <item>2556</item>
+        <item>2557</item>
+        <item>2586</item>
+        <item>2590</item>
+        <item>2601</item>
+        <item>2638</item>
+        <item>2687</item>
+        <item>2959</item>
+        <item>2960</item>
+        <item>2974</item>
+        <item>3166</item>
+        <item>3175</item>
+        <item>3256</item>
+        <item>3414</item>
+        <item>3459</item>
+        <item>3476</item>
+        <item>3504</item>
+        <item>3641</item>
+        <item>3937</item>
+        <item>3970</item>
+        <item>4135</item>
+        <item>4329</item>
+        <item>4381</item>
+        <item>4415</item>
         <item>4786</item>
-        <item>4787</item>
-        <item>5096</item>
-        <item>5148</item>
-        <item>6223</item>
-        <item>6381</item>
-        <item>6421</item>
-        <item>6574</item>
-        <item>6643</item>
-        <item>6823</item>
-        <item>7237</item>
-        <item>7417</item>
-        <item>7900</item>
-        <item>7915</item>
-        <item>8531</item>
-        <item>8700</item>
-        <item>8701</item>
-        <item>8779</item>
-        <item>8802</item>
-        <item>8803</item>
-        <item>8847</item>
+        <item>5086</item>
+        <item>5089</item>
+        <item>5114</item>
+        <item>5422</item>
+        <item>5612</item>
+        <item>5705</item>
+        <item>5724</item>
+        <item>5809</item>
+        <item>5903</item>
+        <item>6413</item>
+        <item>6672</item>
+        <item>7541</item>
+        <item>8122</item>
+        <item>8153</item>
+        <item>8546</item>
+        <item>8573</item>
+        <item>8590</item>
+        <item>8841</item>
+        <item>8898</item>
+
     </string-array>
 
     <string-array name="matches">

diff --git a/sql-backend/Automation/sqlBuilder.py b/sql-backend/Automation/sqlBuilder.py
@@ -19,7 +19,7 @@
 BUILDER_OUTPUT_FILE_NAME = "sqlBuilderOutput.sql" #This is the filename of the build output SQL file
 CURRENT_WORKING_DIRECTORY = os.getcwd() #Get current working directory (cwd) of this file
 SEARCH_FOR_FILETYPE = ".scout" #The filetype to include in the file searches
-TABLE_NAME = "MatchMaster2" #The name of the SQL table we are writing queries for
+TABLE_NAME = "MatchMaster3" #The name of the SQL table we are writing queries for
 
 ####################FUNCTIONS####################