diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 905d890..f5225ed 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -50,6 +50,7 @@ model Employees { supervisor_id Int? job_title String? is_supervisor Boolean @default(false) + // banked_hour_limit Int @default(0) //will need to be implemented in the future schedule_preset_id Int? schedule_preset SchedulePresets? @relation("EmployeesSchedulePreset", fields: [schedule_preset_id], references: [id]) supervisor Employees? @relation("EmployeeSupervisor", fields: [supervisor_id], references: [id]) @@ -103,6 +104,7 @@ model Timesheets { employee_id Int is_approved Boolean @default(false) start_date DateTime @db.Date + // hours_to_bank Decimal? @db.Decimal(5, 2) //will need to be implemented in the future expense Expenses[] @relation("ExpensesTimesheet") shift Shifts[] @relation("ShiftTimesheet") employee Employees @relation("TimesheetEmployee", fields: [employee_id], references: [id]) @@ -324,12 +326,12 @@ model Preferences { } model PaidTimeOff { - id Int @id @default(autoincrement()) - employee_id Int @unique - vacation_hours Decimal @default(0) @db.Decimal(12, 2) - banked_hours Decimal @default(0) @db.Decimal(12, 2) - sick_hours Decimal @default(0) @db.Decimal(12, 2) - last_updated DateTime? @db.Date + id Int @id @default(autoincrement()) + employee_id Int @unique + vacation_hours Decimal @default(0) @db.Decimal(12, 2) + banked_hours Decimal @default(0) @db.Decimal(12, 2) + sick_hours Decimal @default(0) @db.Decimal(12, 2) + last_updated DateTime? @db.Date employee Employees @relation("EmployeePaidTimeOff", fields: [employee_id], references: [id]) diff --git a/src/main.ts b/src/main.ts index feb3352..70c84b6 100644 --- a/src/main.ts +++ b/src/main.ts @@ -56,7 +56,7 @@ async function bootstrap() { // Enable CORS app.enableCors({ - origin: ['http://10.100.251.2:9011', 'http://10.100.251.2:9012', 'http://10.100.251.2:9013', 'http://localhost:9000', 'https://app.targo.ca', 'https://staging.app.targo.ca'], + origin: ['http://10.100.251.2:9011', 'http://10.100.251.2:9012', 'http://10.100.251.2:9013', 'http://localhost:9000', 'https://app.targo.ca', 'https://app2.targo.ca','https://staging.app.targo.ca'], credentials: true, });