Skip to content

Commit fb5dc4c

Browse files
authored
Merge pull request #3632 from Northeastern-Electric-Racing/gantt-chart-tasks
Gantt chart tasks
2 parents 2846ab1 + 4b90915 commit fb5dc4c

28 files changed

Lines changed: 1284 additions & 267 deletions

File tree

src/backend/src/controllers/tasks.controllers.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { validateWBS, WbsNumber } from 'shared';
55
export default class TasksController {
66
static async createTask(req: Request, res: Response, next: NextFunction) {
77
try {
8-
const { title, deadline, priority, status, assignees, notes } = req.body;
8+
const { title, deadline, startDate, priority, status, assignees, notes } = req.body;
99
const wbsNum: WbsNumber = validateWBS(req.params.wbsNum);
1010

1111
const task = await TasksService.createTask(
@@ -17,6 +17,7 @@ export default class TasksController {
1717
status,
1818
assignees,
1919
req.organization,
20+
startDate ? new Date(startDate) : undefined,
2021
deadline ? new Date(deadline) : undefined
2122
);
2223

@@ -28,7 +29,7 @@ export default class TasksController {
2829

2930
static async editTask(req: Request, res: Response, next: NextFunction) {
3031
try {
31-
const { title, notes, priority, deadline } = req.body;
32+
const { title, notes, priority, deadline, startDate } = req.body;
3233
const { taskId } = req.params;
3334

3435
const updateTask = await TasksService.editTask(
@@ -38,7 +39,8 @@ export default class TasksController {
3839
title,
3940
notes,
4041
priority,
41-
deadline
42+
startDate ? new Date(startDate) : undefined,
43+
deadline ? new Date(deadline) : undefined
4244
);
4345

4446
res.status(200).json(updateTask);
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- AlterTable
2+
ALTER TABLE "public"."Task" ADD COLUMN "startDate" TIMESTAMP(3);

src/backend/src/prisma/schema.prisma

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,7 @@ model Task {
632632
title String
633633
notes String
634634
deadline DateTime?
635+
startDate DateTime?
635636
assignees User[] @relation(name: "assignedTo")
636637
priority Task_Priority
637638
status Task_Status

0 commit comments

Comments
 (0)