Skip to content

Commit faa932c

Browse files
IBXCODECATIBXCODECAT
committed
Sad Times
1 parent 703a4c3 commit faa932c

File tree

5 files changed

+77
-61
lines changed

5 files changed

+77
-61
lines changed

‎.idea/deploymentTargetDropDown.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎app/src/main/java/com/ibxcodecat/frc_scouting/DataEntryActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ class DataEntryActivity : AppCompatActivity() {
187187
teamNumber.selectedItem.toString().toInt(),
188188
matchNumber.selectedItemPosition,
189189
scoutedBy.text.toString(),
190-
regionalToggle.text.toString(),
190+
"Houston",
191191
taxiToggle.isChecked,
192192
score.text.toString().toInt(),
193193
comments.text.toString(),

‎app/src/main/res/layout/activity_data_entry.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@
281281
android:layout_marginTop="16dp"
282282
android:checked="true"
283283
android:textColor="#455A64"
284-
android:textOff="@string/regionalOffText"
285-
android:textOn="@string/regionalOnText"
284+
android:textOff="I still do nothing"
285+
android:textOn="click me for nothing"
286286
app:layout_constraintStart_toEndOf="@+id/verticalDivider"
287287
app:layout_constraintTop_toTopOf="parent"
288288
tools:ignore="TextContrastCheck" />

‎app/src/main/res/values/arrays.xml

Lines changed: 73 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,82 @@
99

1010
<string-array name="teams">
1111
<item>Team #</item>
12-
<item>93</item>
13-
<item>537</item>
14-
<item>706</item>
15-
<item>930</item>
16-
<item>1091</item>
17-
<item>1259</item>
18-
<item>1306</item>
19-
<item>1675</item>
20-
<item>1714</item>
12+
<item>86</item>
13+
<item>88</item>
14+
<item>118</item>
15+
<item>254</item>
16+
<item>316</item>
17+
<item>364</item>
18+
<item>401</item>
19+
<item>498</item>
20+
<item>599</item>
21+
<item>694</item>
22+
<item>846</item>
23+
<item>857</item>
24+
<item>1023</item>
25+
<item>1506</item>
26+
<item>1619</item>
27+
<item>1629</item>
28+
<item>1731</item>
2129
<item>1732</item>
22-
<item>1739</item>
23-
<item>1792</item>
24-
<item>2062</item>
25-
<item>2077</item>
26-
<item>2194</item>
27-
<item>2202</item>
30+
<item>1745</item>
31+
<item>1756</item>
32+
<item>1771</item>
33+
<item>1816</item>
34+
<item>1828</item>
35+
<item>1868</item>
36+
<item>1914</item>
37+
<item>1918</item>
38+
<item>2147</item>
39+
<item>2168</item>
40+
<item>2438</item>
41+
<item>2481</item>
2842
<item>2506</item>
29-
<item>2574</item>
30-
<item>2830</item>
31-
<item>3197</item>
32-
<item>3418</item>
33-
<item>3596</item>
43+
<item>2556</item>
44+
<item>2557</item>
45+
<item>2586</item>
46+
<item>2590</item>
47+
<item>2601</item>
48+
<item>2638</item>
49+
<item>2687</item>
50+
<item>2959</item>
51+
<item>2960</item>
52+
<item>2974</item>
53+
<item>3166</item>
54+
<item>3175</item>
55+
<item>3256</item>
56+
<item>3414</item>
57+
<item>3459</item>
58+
<item>3476</item>
59+
<item>3504</item>
60+
<item>3641</item>
61+
<item>3937</item>
62+
<item>3970</item>
63+
<item>4135</item>
64+
<item>4329</item>
65+
<item>4381</item>
66+
<item>4415</item>
3467
<item>4786</item>
35-
<item>4787</item>
36-
<item>5096</item>
37-
<item>5148</item>
38-
<item>6223</item>
39-
<item>6381</item>
40-
<item>6421</item>
41-
<item>6574</item>
42-
<item>6643</item>
43-
<item>6823</item>
44-
<item>7237</item>
45-
<item>7417</item>
46-
<item>7900</item>
47-
<item>7915</item>
48-
<item>8531</item>
49-
<item>8700</item>
50-
<item>8701</item>
51-
<item>8779</item>
52-
<item>8802</item>
53-
<item>8803</item>
54-
<item>8847</item>
68+
<item>5086</item>
69+
<item>5089</item>
70+
<item>5114</item>
71+
<item>5422</item>
72+
<item>5612</item>
73+
<item>5705</item>
74+
<item>5724</item>
75+
<item>5809</item>
76+
<item>5903</item>
77+
<item>6413</item>
78+
<item>6672</item>
79+
<item>7541</item>
80+
<item>8122</item>
81+
<item>8153</item>
82+
<item>8546</item>
83+
<item>8573</item>
84+
<item>8590</item>
85+
<item>8841</item>
86+
<item>8898</item>
87+
5588
</string-array>
5689

5790
<string-array name="matches">

‎sql-backend/Automation/sqlBuilder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
BUILDER_OUTPUT_FILE_NAME = "sqlBuilderOutput.sql" #This is the filename of the build output SQL file
2020
CURRENT_WORKING_DIRECTORY = os.getcwd() #Get current working directory (cwd) of this file
2121
SEARCH_FOR_FILETYPE = ".scout" #The filetype to include in the file searches
22-
TABLE_NAME = "MatchMaster2" #The name of the SQL table we are writing queries for
22+
TABLE_NAME = "MatchMaster3" #The name of the SQL table we are writing queries for
2323

2424
####################FUNCTIONS####################
2525

0 commit comments

Comments
 (0)