Add support for monthly and weekly targets with work-day selection: - Users can now set targets as 'monthly' or 'weekly' - Users select which days of the week they work - Balance is calculated per working day, evenly distributed - Target hours = (periodHours / workingDaysInPeriod) - Corrections are applied at period level - Daily balance tracking replaces weekly granularity Database changes: - Rename weekly_hours -> target_hours - Add period_type (weekly|monthly, default=weekly) - Add work_days (integer array of ISO weekdays, default=[1,2,3,4,5]) - Add constraints for valid period_type and non-empty work_days Backend: - Rewrite balance calculation in ClientTargetService - Support monthly period enumeration - Calculate per-day targets based on selected working days - Update Zod schemas for new fields - Update TypeScript types Frontend: - Add period type selector in target form (weekly/monthly) - Add work days multi-checkbox selector - Conditional start date input (week vs month) - Update DashboardPage to show 'this period' instead of 'this week' - Update ClientsPage to display working days and period type - Support both weekly and monthly targets in UI Migration: - Add migration to extend client_targets table with new columns - Backfill existing targets with default values (weekly, Mon-Fri)
149 lines
4.8 KiB
Plaintext
149 lines
4.8 KiB
Plaintext
generator client {
|
|
provider = "prisma-client-js"
|
|
}
|
|
|
|
datasource db {
|
|
provider = "postgresql"
|
|
url = env("DATABASE_URL")
|
|
}
|
|
|
|
model User {
|
|
id String @id @db.VarChar(255)
|
|
username String @db.VarChar(255)
|
|
fullName String? @map("full_name") @db.VarChar(255)
|
|
email String @db.VarChar(255)
|
|
createdAt DateTime @default(now()) @map("created_at")
|
|
updatedAt DateTime @updatedAt @map("updated_at")
|
|
|
|
clients Client[]
|
|
projects Project[]
|
|
timeEntries TimeEntry[]
|
|
ongoingTimer OngoingTimer?
|
|
clientTargets ClientTarget[]
|
|
|
|
@@map("users")
|
|
}
|
|
|
|
model Client {
|
|
id String @id @default(uuid())
|
|
name String @db.VarChar(255)
|
|
description String? @db.Text
|
|
createdAt DateTime @default(now()) @map("created_at")
|
|
updatedAt DateTime @updatedAt @map("updated_at")
|
|
deletedAt DateTime? @map("deleted_at")
|
|
|
|
userId String @map("user_id") @db.VarChar(255)
|
|
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
|
projects Project[]
|
|
clientTargets ClientTarget[]
|
|
|
|
@@index([userId])
|
|
@@map("clients")
|
|
}
|
|
|
|
model Project {
|
|
id String @id @default(uuid())
|
|
name String @db.VarChar(255)
|
|
description String? @db.Text
|
|
color String? @db.VarChar(7) // Hex color code
|
|
createdAt DateTime @default(now()) @map("created_at")
|
|
updatedAt DateTime @updatedAt @map("updated_at")
|
|
deletedAt DateTime? @map("deleted_at")
|
|
|
|
userId String @map("user_id") @db.VarChar(255)
|
|
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
|
clientId String @map("client_id")
|
|
client Client @relation(fields: [clientId], references: [id], onDelete: Cascade)
|
|
|
|
timeEntries TimeEntry[]
|
|
ongoingTimers OngoingTimer[]
|
|
|
|
@@index([userId])
|
|
@@index([clientId])
|
|
@@map("projects")
|
|
}
|
|
|
|
model TimeEntry {
|
|
id String @id @default(uuid())
|
|
startTime DateTime @map("start_time") @db.Timestamptz()
|
|
endTime DateTime @map("end_time") @db.Timestamptz()
|
|
breakMinutes Int @default(0) @map("break_minutes")
|
|
description String? @db.Text
|
|
createdAt DateTime @default(now()) @map("created_at")
|
|
updatedAt DateTime @updatedAt @map("updated_at")
|
|
deletedAt DateTime? @map("deleted_at")
|
|
|
|
userId String @map("user_id") @db.VarChar(255)
|
|
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
|
projectId String @map("project_id")
|
|
project Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
|
|
|
|
@@index([userId])
|
|
@@index([userId, startTime])
|
|
@@index([projectId])
|
|
@@map("time_entries")
|
|
}
|
|
|
|
model OngoingTimer {
|
|
id String @id @default(uuid())
|
|
startTime DateTime @map("start_time") @db.Timestamptz()
|
|
createdAt DateTime @default(now()) @map("created_at")
|
|
updatedAt DateTime @updatedAt @map("updated_at")
|
|
|
|
userId String @unique @map("user_id") @db.VarChar(255)
|
|
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
|
projectId String? @map("project_id")
|
|
project Project? @relation(fields: [projectId], references: [id], onDelete: SetNull)
|
|
|
|
@@index([userId])
|
|
@@map("ongoing_timers")
|
|
}
|
|
|
|
model ClientTarget {
|
|
id String @id @default(uuid())
|
|
targetHours Float @map("target_hours")
|
|
periodType String @default("weekly") @map("period_type") @db.VarChar(10) // 'weekly' | 'monthly'
|
|
workDays Int[] @default([1, 2, 3, 4, 5]) @map("work_days") // ISO weekday numbers (1=Mon, 7=Sun)
|
|
startDate DateTime @map("start_date") @db.Date // Monday for weekly, 1st of month for monthly
|
|
createdAt DateTime @default(now()) @map("created_at")
|
|
updatedAt DateTime @updatedAt @map("updated_at")
|
|
deletedAt DateTime? @map("deleted_at")
|
|
|
|
userId String @map("user_id") @db.VarChar(255)
|
|
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
|
clientId String @map("client_id")
|
|
client Client @relation(fields: [clientId], references: [id], onDelete: Cascade)
|
|
|
|
corrections BalanceCorrection[]
|
|
|
|
@@unique([userId, clientId])
|
|
@@index([userId])
|
|
@@index([clientId])
|
|
@@map("client_targets")
|
|
}
|
|
|
|
model BalanceCorrection {
|
|
id String @id @default(uuid())
|
|
date DateTime @map("date") @db.Date
|
|
hours Float
|
|
description String? @db.VarChar(255)
|
|
createdAt DateTime @default(now()) @map("created_at")
|
|
updatedAt DateTime @updatedAt @map("updated_at")
|
|
deletedAt DateTime? @map("deleted_at")
|
|
|
|
clientTargetId String @map("client_target_id")
|
|
clientTarget ClientTarget @relation(fields: [clientTargetId], references: [id], onDelete: Cascade)
|
|
|
|
@@index([clientTargetId])
|
|
@@map("balance_corrections")
|
|
}
|
|
|
|
model Session {
|
|
id String @id
|
|
sid String @unique
|
|
data String @db.Text
|
|
expiresAt DateTime @map("expires_at")
|
|
|
|
@@map("sessions")
|
|
}
|