Skip to content

Commit 40a19f8

Browse files
committed
Revert "move addNotOnTeam.ts"
This reverts commit 8f5b284.
1 parent 8f5b284 commit 40a19f8

3 files changed

Lines changed: 37 additions & 23 deletions

File tree

prisma/schema.prisma

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,11 @@ model ScoutReport {
5252
startTime DateTime
5353
notes String
5454
robotRole RobotRole
55-
climbResult ClimbResult
56-
underTrench UnderTrench
57-
overRamp OverRamp
58-
shootingAccuracy Int
55+
algaePickup AlgaePickup
56+
coralPickup CoralPickup
57+
bargeResult BargeResult
58+
knocksAlgae KnocksAlgae
59+
underShallowCage UnderShallowCage
5960
robotBrokeDescription String?
6061
driverAbility Int
6162
scouterUuid String
@@ -277,33 +278,46 @@ enum RobotRole {
277278
IMMOBILE
278279
}
279280

280-
enum UnderTrench {
281+
enum AlgaePickup {
282+
NONE
283+
GROUND
284+
REEF
285+
BOTH
286+
}
287+
288+
enum KnocksAlgae {
281289
NO
282290
YES
283291
}
284292

285-
enum OverRamp {
293+
enum AutoLeave {
286294
NO
287295
YES
288296
}
289297

290-
enum ClimbResult {
298+
enum UnderShallowCage {
299+
NO
300+
YES
301+
}
302+
303+
enum CoralPickup {
304+
NONE
305+
GROUND
306+
STATION
307+
BOTH
308+
}
309+
310+
enum BargeResult {
291311
NOT_ATTEMPTED
292-
LEFT_ONE
293-
LEFT_TWO
294-
LEFT_THREE
295-
RIGHT_ONE
296-
RIGHT_TWO
297-
RIGHT_THREE
298-
MIDDLE_ONE
299-
MIDDLE_TWO
300-
MIDDLE_THREE
301-
BACK_ONE
302-
BACK_TWO
303-
BACK_THREE
312+
PARKED
313+
SHALLOW
314+
FAILED_SHALLOW
315+
DEEP
316+
FAILED_DEEP
304317
}
305318

306319
enum WarningType {
320+
AUTO_LEAVE
307321
BREAK
308322
}
309323

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Response } from "express";
2-
import prismaClient from "../../prismaClient.js";
3-
import { AuthenticatedRequest } from "../../lib/middleware/requireAuth.js";
2+
import prismaClient from "../../../prismaClient.js";
3+
import { AuthenticatedRequest } from "../../../lib/middleware/requireAuth.js";
44

55
export const addNotOnTeam = async (
66
req: AuthenticatedRequest,
7-
res: Response
7+
res: Response,
88
): Promise<void> => {
99
try {
1010
const user = await prismaClient.user.update({

src/routes/manager/manager.routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { getUsers } from "../../handler/manager/getUsers.js";
2121
import { deleteUser } from "../../handler/manager/deleteUser.js";
2222
import { updateRoleToScoutingLead } from "../../handler/manager/scouters/updateRoleToScoutingLead.js";
2323
import { getAnalysts } from "../../handler/manager/getAnalysts.js";
24-
import { addNotOnTeam } from "../../handler/manager/addNotOnTeam.js";
24+
import { addNotOnTeam } from "../../handler/manager/temp/addNotOnTeam.js";
2525
import { getTeamCode } from "../../handler/manager/getTeamCode.js";
2626
import { addScoutReportDashboard } from "../../handler/manager/scoutreports/addScoutReportDashboard.js";
2727
import { getTeamTournamentStatus } from "../../handler/manager/getTeamTournamentStatus.js";

0 commit comments

Comments
 (0)