Skip to content

Commit 2ff07f5

Browse files
authored
Merge pull request #4104 from Northeastern-Electric-Racing/feature/gantt-chart-improvements
Feature/gantt chart improvements
2 parents 8fea0fa + ad963fa commit 2ff07f5

21 files changed

Lines changed: 1997 additions & 628 deletions

File tree

src/backend/src/prisma-query-args/teams.query-args.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const getTeamQueryArgs = (organizationId: string) =>
1313
head: getUserQueryArgs(organizationId),
1414
leads: getUserQueryArgs(organizationId),
1515
userArchived: getUserQueryArgs(organizationId),
16-
teamType: true,
16+
teamType: { select: { teamTypeId: true, name: true } },
1717
projects: {
1818
where: {
1919
wbsElement: {

src/backend/src/prisma/seed-data/reimbursement-requests.seed.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ export const seedReimbursementRequests = async (
4747
karen: any;
4848
spongebob: any;
4949
patrick: any;
50+
squidward: any;
51+
sandy: any;
52+
pearl: any;
53+
larry: any;
5054
},
5155
vendors: {
5256
tesla: Vendor;

src/backend/src/prisma/seed-data/teams.seed.ts

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,37 @@ const meanGirls = (headId: string, organizationId: string): Prisma.TeamCreateArg
115115
};
116116
};
117117

118-
export const dbSeedAllTeams = { ravens, orioles, justiceLeague, huskies, avatarBenders, plLegends, financeTeam, meanGirls };
118+
const krustyKrabers = (headId: string, organizationId: string): Prisma.TeamCreateArgs => {
119+
return {
120+
data: {
121+
teamName: 'Krusty Krab Crew',
122+
slackId: 'C06HR7WTTKM',
123+
headId,
124+
organizationId
125+
}
126+
};
127+
};
128+
129+
const penguinsOfMadagascar = (headId: string, organizationId: string): Prisma.TeamCreateArgs => {
130+
return {
131+
data: {
132+
teamName: 'Penguins of Madagascar',
133+
slackId: 'C06HR7WTTKM',
134+
headId,
135+
organizationId
136+
}
137+
};
138+
};
139+
140+
export const dbSeedAllTeams = {
141+
ravens,
142+
orioles,
143+
justiceLeague,
144+
huskies,
145+
avatarBenders,
146+
plLegends,
147+
financeTeam,
148+
meanGirls,
149+
krustyKrabers,
150+
penguinsOfMadagascar
151+
};

src/backend/src/prisma/seed-data/users.seed.ts

Lines changed: 141 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,6 +856,68 @@ const kingJulian: Prisma.UserCreateInput = {
856856
email: 'iliketomoveit@jungle.net'
857857
};
858858

859+
const skipper: Prisma.UserCreateInput = {
860+
firstName: 'Skipper',
861+
lastName: 'Penguin',
862+
googleAuthId: 'skipperpenguin',
863+
email: 'allrightboys@penguin.net',
864+
userSettings: {
865+
create: {
866+
defaultTheme: Theme.DARK,
867+
slackId: SLACK_ID ? SLACK_ID : 'Penguin Boss'
868+
}
869+
}
870+
};
871+
872+
const kowalski: Prisma.UserCreateInput = {
873+
firstName: 'kowalski',
874+
lastName: 'Penguin',
875+
googleAuthId: 'kowalskipenguin',
876+
email: 'kowalskipenguin@penguin.net'
877+
};
878+
879+
const privat: Prisma.UserCreateInput = {
880+
firstName: 'Private',
881+
lastName: 'Penguin',
882+
googleAuthId: 'privatepenguin',
883+
email: 'privatepenguin@penguin.net'
884+
};
885+
886+
const rico: Prisma.UserCreateInput = {
887+
firstName: 'Rico',
888+
lastName: 'Penguin',
889+
googleAuthId: 'ricopenguin',
890+
email: 'ricopenguin@penguin.net'
891+
};
892+
893+
const alex: Prisma.UserCreateInput = {
894+
firstName: 'Alex',
895+
lastName: 'The Lion',
896+
googleAuthId: 'alexlion',
897+
email: 'alexthe@lion.org'
898+
};
899+
900+
const marty: Prisma.UserCreateInput = {
901+
firstName: 'Marty',
902+
lastName: 'The Zebra',
903+
googleAuthId: 'martyzebra',
904+
email: 'marty@zebra.com'
905+
};
906+
907+
const gloria: Prisma.UserCreateInput = {
908+
firstName: 'Gloria',
909+
lastName: 'The Hippo',
910+
googleAuthId: 'gloriahippo',
911+
email: 'gloria@hippo.hippo'
912+
};
913+
914+
const melman: Prisma.UserCreateInput = {
915+
firstName: 'Melman',
916+
lastName: 'The Giraffe',
917+
googleAuthId: 'melmangiraffe',
918+
email: 'melman@giraffe.com'
919+
};
920+
859921
const regina: Prisma.UserCreateInput = {
860922
firstName: 'Regina',
861923
lastName: 'George',
@@ -1004,6 +1066,71 @@ const patrick: Prisma.UserCreateInput = {
10041066
}
10051067
};
10061068

1069+
const squidward: Prisma.UserCreateInput = {
1070+
firstName: 'Squidward',
1071+
lastName: 'Tenticles',
1072+
googleAuthId: 'squidward',
1073+
email: 'squidwardtenticles@yahoo.com',
1074+
userSettings: {
1075+
create: {
1076+
defaultTheme: Theme.DARK,
1077+
slackId: SLACK_ID ? SLACK_ID : 'squidward'
1078+
}
1079+
}
1080+
};
1081+
1082+
const sandy: Prisma.UserCreateInput = {
1083+
firstName: 'Sandy',
1084+
lastName: 'Star',
1085+
googleAuthId: 'sandy',
1086+
email: 'sandystar@gmail.com',
1087+
userSettings: {
1088+
create: {
1089+
defaultTheme: Theme.LIGHT,
1090+
slackId: SLACK_ID ? SLACK_ID : 'sandy'
1091+
}
1092+
}
1093+
};
1094+
1095+
const pearl: Prisma.UserCreateInput = {
1096+
firstName: 'Pearl',
1097+
lastName: 'Whale',
1098+
googleAuthId: 'pearl',
1099+
email: 'pearlwhale@gmail.com',
1100+
userSettings: {
1101+
create: {
1102+
defaultTheme: Theme.LIGHT,
1103+
slackId: SLACK_ID ? SLACK_ID : 'pearl'
1104+
}
1105+
}
1106+
};
1107+
1108+
const larry: Prisma.UserCreateInput = {
1109+
firstName: 'Larry',
1110+
lastName: 'The Lobster',
1111+
googleAuthId: 'larry',
1112+
email: 'larryLobster@lobster.lob',
1113+
userSettings: {
1114+
create: {
1115+
defaultTheme: Theme.LIGHT,
1116+
slackId: SLACK_ID ? SLACK_ID : 'pearl'
1117+
}
1118+
}
1119+
};
1120+
1121+
const mrsPuff: Prisma.UserCreateInput = {
1122+
firstName: 'Mrs.',
1123+
lastName: 'Puff',
1124+
googleAuthId: 'puff',
1125+
email: 'puff@pufferfish.com',
1126+
userSettings: {
1127+
create: {
1128+
defaultTheme: Theme.LIGHT,
1129+
slackId: SLACK_ID ? SLACK_ID : 'puff'
1130+
}
1131+
}
1132+
};
1133+
10071134
export const dbSeedAllUsers = {
10081135
thomasEmrax,
10091136
joeShmoe,
@@ -1105,6 +1232,14 @@ export const dbSeedAllUsers = {
11051232
francis,
11061233
victorPerkins,
11071234
kingJulian,
1235+
skipper,
1236+
kowalski,
1237+
privat,
1238+
rico,
1239+
alex,
1240+
marty,
1241+
gloria,
1242+
melman,
11081243
regina,
11091244
gretchen,
11101245
karen,
@@ -1120,7 +1255,12 @@ export const dbSeedAllUsers = {
11201255
carr,
11211256
trang,
11221257
spongebob,
1123-
patrick
1258+
patrick,
1259+
squidward,
1260+
sandy,
1261+
pearl,
1262+
larry,
1263+
mrsPuff
11241264
};
11251265

11261266
export const createUser = async (user: Prisma.UserCreateInput, role: RoleEnum, organizationId: string) => {

0 commit comments

Comments
 (0)