@ossy/timesheets 3.8.0 → 3.10.0

package/src/auto-generate-timesheets.task.js

@@ -0,0 +1,60 @@
+import { ResourcesQueries } from '@ossy/resources/server'
+import {
+  AUTO_GENERATE_QUERY,
+  contractsNeedingTimesheets,
+  holidayLocaleForWorkspace,
+} from './auto-generate-timesheets.js'
+import { createTimesheetDraft } from './create-timesheet-draft.js'
+
+export const metadata = {
+  id: '@ossy/timesheets/tasks/auto-generate',
+  // Daily at 06:00 UTC — create sheets when a billing period is open
+  schedule: '0 6 * * *',
+}
+
+/**
+ * Auto-generate draft timesheets for active consultancy contracts based on
+ * each contract's billing period (weekly / monthly). Idempotent per
+ * (workspace, contractId, periodStart).
+ */
+export async function run ({ log }) {
+  const now = Date.now()
+
+  const [contracts, timesheets, companies] = await Promise.all([
+    ResourcesQueries.GetResources(AUTO_GENERATE_QUERY.contracts),
+    ResourcesQueries.GetResources(AUTO_GENERATE_QUERY.timesheets),
+    ResourcesQueries.GetResources(AUTO_GENERATE_QUERY.companies),
+  ])
+
+  const needed = contractsNeedingTimesheets({ contracts, timesheets, asOf: now })
+  log?.info(`[timesheets/tasks/auto-generate] ${needed.length} contract(s) need a sheet`)
+
+  let created = 0
+  let failed = 0
+
+  for (const item of needed) {
+    try {
+      const locale = holidayLocaleForWorkspace(companies, item.workspaceId)
+      await createTimesheetDraft({
+        workspaceId: item.workspaceId,
+        periodStart: item.periodStart,
+        periodEnd: item.periodEnd,
+        locale,
+        employeeId: item.employeeId,
+        contractId: item.contractId,
+        createdBy: metadata.id,
+        autoGenerated: true,
+        log,
+      })
+      created++
+    } catch (err) {
+      failed++
+      log?.error(
+        `[timesheets/tasks/auto-generate] failed for contract ${item.contractId}`,
+        err,
+      )
+    }
+  }
+
+  return { created, failed, candidates: needed.length }
+}

package/src/billing-period.js

@@ -0,0 +1,123 @@
+import { optionalReference } from './timesheet-refs.js'
+
+export const BILLING_PERIODS = Object.freeze(['weekly', 'monthly'])
+export const DEFAULT_BILLING_PERIOD = 'monthly'
+
+/**
+ * @param {unknown} value
+ * @returns {'weekly' | 'monthly'}
+ */
+export function normalizeBillingPeriod (value) {
+  if (value === 'weekly' || value === 'monthly') return value
+  return DEFAULT_BILLING_PERIOD
+}
+
+/**
+ * @param {unknown} value — Unix ms, ISO string, or Date
+ * @returns {number | null}
+ */
+export function toMs (value) {
+  if (value == null || value === '') return null
+  if (typeof value === 'number' && Number.isFinite(value)) return value
+  if (value instanceof Date && !Number.isNaN(value.getTime())) return value.getTime()
+  if (typeof value === 'string') {
+    const parsed = Date.parse(value)
+    if (!Number.isNaN(parsed)) return parsed
+  }
+  return null
+}
+
+/**
+ * Calendar-month period bounds as local midnights, returned as Unix ms.
+ * @param {number} year
+ * @param {number} monthIndex 0–11
+ */
+export function monthPeriodBounds (year, monthIndex) {
+  const start = new Date(year, monthIndex, 1)
+  const end = new Date(year, monthIndex + 1, 0)
+  start.setHours(0, 0, 0, 0)
+  end.setHours(0, 0, 0, 0)
+  return {
+    periodStart: start.getTime(),
+    periodEnd: end.getTime(),
+  }
+}
+
+/**
+ * ISO-week (Mon–Sun) period bounds as local midnights, returned as Unix ms.
+ * @param {Date | number} [asOf]
+ */
+export function weekPeriodBounds (asOf = Date.now()) {
+  const ref = new Date(asOf)
+  ref.setHours(0, 0, 0, 0)
+  const day = ref.getDay() // 0 Sun … 6 Sat
+  const daysFromMonday = day === 0 ? 6 : day - 1
+  const start = new Date(ref)
+  start.setDate(ref.getDate() - daysFromMonday)
+  start.setHours(0, 0, 0, 0)
+  const end = new Date(start)
+  end.setDate(start.getDate() + 6)
+  end.setHours(0, 0, 0, 0)
+  return {
+    periodStart: start.getTime(),
+    periodEnd: end.getTime(),
+  }
+}
+
+/**
+ * Billing period that contains `asOf` for a contract's billing policy.
+ * @param {{ billingPeriod?: string } | null | undefined} contract
+ * @param {Date | number} [asOf]
+ */
+export function periodForContract (contract, asOf = Date.now()) {
+  const billingPeriod = normalizeBillingPeriod(contract?.billingPeriod)
+  if (billingPeriod === 'weekly') return weekPeriodBounds(asOf)
+  const ref = new Date(asOf)
+  return monthPeriodBounds(ref.getFullYear(), ref.getMonth())
+}
+
+/**
+ * Contract is active on `asOf` when start ≤ asOf and (no end or end ≥ asOf day start).
+ * @param {{ startDate?: unknown, endDate?: unknown } | null | undefined} contract
+ * @param {Date | number} [asOf]
+ */
+export function isContractActive (contract, asOf = Date.now()) {
+  if (!contract) return false
+  const asOfMs = toMs(asOf) ?? Date.now()
+  const dayStart = new Date(asOfMs)
+  dayStart.setHours(0, 0, 0, 0)
+  const dayMs = dayStart.getTime()
+
+  const startMs = toMs(contract.startDate)
+  if (startMs != null) {
+    const startDay = new Date(startMs)
+    startDay.setHours(0, 0, 0, 0)
+    if (dayMs < startDay.getTime()) return false
+  }
+
+  const endMs = toMs(contract.endDate)
+  if (endMs != null) {
+    const endDay = new Date(endMs)
+    endDay.setHours(0, 0, 0, 0)
+    if (dayMs > endDay.getTime()) return false
+  }
+
+  return true
+}
+
+/**
+ * Newest timesheet for a contract + periodStart pair.
+ * @param {Array<{ id: string, createdAt?: number, content?: object }>} resources
+ * @param {string} contractId
+ * @param {number} periodStart
+ */
+export function findTimesheetForContractPeriod (resources, contractId, periodStart) {
+  if (!contractId || periodStart == null) return null
+  const matches = (resources || []).filter((r) => {
+    if (r.content?.periodStart !== periodStart) return false
+    const ref = optionalReference(r.content?.contractId)
+    return ref?.resourceId === contractId
+  })
+  if (matches.length === 0) return null
+  return [...matches].sort((a, b) => (b.createdAt ?? 0) - (a.createdAt ?? 0))[0]
+}

package/src/billing-period.spec.js

@@ -0,0 +1,89 @@
+import { describe, expect, it } from '@jest/globals'
+import {
+  findTimesheetForContractPeriod,
+  isContractActive,
+  normalizeBillingPeriod,
+  periodForContract,
+  weekPeriodBounds,
+} from './billing-period.js'
+
+describe('normalizeBillingPeriod', () => {
+  it('defaults unknown values to monthly', () => {
+    expect(normalizeBillingPeriod('weekly')).toBe('weekly')
+    expect(normalizeBillingPeriod('monthly')).toBe('monthly')
+    expect(normalizeBillingPeriod(undefined)).toBe('monthly')
+    expect(normalizeBillingPeriod('quarterly')).toBe('monthly')
+  })
+})
+
+describe('weekPeriodBounds', () => {
+  it('returns Mon–Sun containing the reference day', () => {
+    // Wednesday 2026-08-19 local
+    const { periodStart, periodEnd } = weekPeriodBounds(new Date(2026, 7, 19))
+    expect(new Date(periodStart).getDay()).toBe(1) // Monday
+    expect(new Date(periodEnd).getDay()).toBe(0) // Sunday
+    expect(new Date(periodStart).getDate()).toBe(17)
+    expect(new Date(periodEnd).getDate()).toBe(23)
+  })
+
+  it('treats Sunday as end of the current ISO week', () => {
+    const { periodStart, periodEnd } = weekPeriodBounds(new Date(2026, 7, 23))
+    expect(new Date(periodStart).getDate()).toBe(17)
+    expect(new Date(periodEnd).getDate()).toBe(23)
+  })
+})
+
+describe('periodForContract', () => {
+  it('uses calendar month when billingPeriod is monthly or missing', () => {
+    const asOf = new Date(2026, 7, 19)
+    expect(periodForContract({ billingPeriod: 'monthly' }, asOf)).toEqual({
+      periodStart: new Date(2026, 7, 1).setHours(0, 0, 0, 0),
+      periodEnd: new Date(2026, 7, 31).setHours(0, 0, 0, 0),
+    })
+    expect(periodForContract({}, asOf).periodStart).toBe(
+      new Date(2026, 7, 1).setHours(0, 0, 0, 0),
+    )
+  })
+
+  it('uses ISO week when billingPeriod is weekly', () => {
+    const asOf = new Date(2026, 7, 19)
+    expect(periodForContract({ billingPeriod: 'weekly' }, asOf)).toEqual(
+      weekPeriodBounds(asOf),
+    )
+  })
+})
+
+describe('isContractActive', () => {
+  it('requires start ≤ asOf and end ≥ asOf when set', () => {
+    const asOf = new Date(2026, 7, 19)
+    expect(isContractActive({
+      startDate: new Date(2026, 0, 1).getTime(),
+      endDate: new Date(2026, 11, 31).getTime(),
+    }, asOf)).toBe(true)
+
+    expect(isContractActive({
+      startDate: new Date(2026, 8, 1).getTime(),
+    }, asOf)).toBe(false)
+
+    expect(isContractActive({
+      startDate: new Date(2026, 0, 1).getTime(),
+      endDate: new Date(2026, 6, 1).getTime(),
+    }, asOf)).toBe(false)
+
+    expect(isContractActive({
+      startDate: new Date(2026, 0, 1).getTime(),
+    }, asOf)).toBe(true)
+  })
+})
+
+describe('findTimesheetForContractPeriod', () => {
+  it('matches contract id + period and returns the newest', () => {
+    const resources = [
+      { id: 'a', createdAt: 1, content: { periodStart: 100, contractId: 'c1' } },
+      { id: 'b', createdAt: 3, content: { periodStart: 100, contractId: { resourceId: 'c1' } } },
+      { id: 'c', createdAt: 9, content: { periodStart: 100, contractId: 'c2' } },
+    ]
+    expect(findTimesheetForContractPeriod(resources, 'c1', 100)?.id).toBe('b')
+    expect(findTimesheetForContractPeriod(resources, 'c1', 999)).toBe(null)
+  })
+})

package/src/build-prefilled-lines.js

@@ -1,25 +1,12 @@
 import { CalendarClient } from '@ossy/calendar'
 import { DEFAULT_HOLIDAY_LOCALE, resolveHolidayLocale } from './holiday-locale.js'
+import { monthPeriodBounds } from './billing-period.js'
+
+export { monthPeriodBounds }
 
 /** Prefill hours for a workday (SPEC). */
 export const WORKDAY_HOURS = 8
 
-/**
- * Calendar-month period bounds as local midnights, returned as Unix ms.
- * @param {number} year
- * @param {number} monthIndex 0–11
- */
-export function monthPeriodBounds (year, monthIndex) {
-  const start = new Date(year, monthIndex, 1)
-  const end = new Date(year, monthIndex + 1, 0)
-  start.setHours(0, 0, 0, 0)
-  end.setHours(0, 0, 0, 0)
-  return {
-    periodStart: start.getTime(),
-    periodEnd: end.getTime(),
-  }
-}
-
 /**
  * Build prefilled timesheet lines for an inclusive period.
  * Workdays → 8h; non-workdays → 0h. `isWorkday` is snapshotted.

package/src/create-timesheet-draft.js

@@ -0,0 +1,81 @@
+import { nanoid } from 'nanoid'
+import { ResourcesEvents, commitResource } from '@ossy/resources/server'
+import { TimesheetsSchema } from './schema-ids.js'
+import { timesheets } from './locations.js'
+import { buildPrefilledLines } from './build-prefilled-lines.js'
+import { DEFAULT_HOLIDAY_LOCALE, resolveHolidayLocale } from './holiday-locale.js'
+import { toTimesheetDto } from './timesheet-dto.js'
+import { optionalReference } from './timesheet-refs.js'
+
+/**
+ * Create a draft timesheet resource (shared by manual generate and auto-generate).
+ *
+ * @param {object} options
+ * @param {string} options.workspaceId
+ * @param {number} options.periodStart
+ * @param {number} options.periodEnd
+ * @param {string} [options.locale]
+ * @param {unknown} [options.employeeId]
+ * @param {unknown} [options.contractId]
+ * @param {string} [options.createdBy]
+ * @param {boolean} [options.autoGenerated]
+ * @param {{ info?: Function }} [options.log]
+ */
+export async function createTimesheetDraft ({
+  workspaceId,
+  periodStart,
+  periodEnd,
+  locale,
+  employeeId: employeeIdRaw,
+  contractId: contractIdRaw,
+  createdBy = 'system',
+  autoGenerated = false,
+  log,
+} = {}) {
+  if (!workspaceId) {
+    throw Object.assign(new Error('workspaceId is required'), { status: 400 })
+  }
+
+  periodStart = Number(periodStart)
+  periodEnd = Number(periodEnd)
+
+  if (!Number.isFinite(periodStart) || !Number.isFinite(periodEnd) || periodEnd < periodStart) {
+    throw Object.assign(new Error('invalid period'), { status: 400 })
+  }
+
+  const holidayLocale = resolveHolidayLocale(locale, DEFAULT_HOLIDAY_LOCALE)
+  const employeeId = optionalReference(employeeIdRaw)
+  const contractId = optionalReference(contractIdRaw)
+
+  log?.info?.(
+    `[timesheets] create draft ${periodStart}–${periodEnd} for workspace ${workspaceId} (locale ${holidayLocale})`,
+  )
+
+  const lines = buildPrefilledLines(periodStart, periodEnd, holidayLocale)
+  const content = {
+    periodStart,
+    periodEnd,
+    status: 'draft',
+    holidayLocale,
+    lines,
+    ...(employeeId ? { employeeId } : {}),
+    ...(contractId ? { contractId } : {}),
+    ...(autoGenerated ? { autoGenerated: true } : {}),
+  }
+
+  const resourceId = nanoid()
+  const event = ResourcesEvents.Created({
+    resourceId,
+    schemaId: TimesheetsSchema.timesheet,
+    createdBy,
+    belongsTo: workspaceId,
+    location: timesheets,
+    name: `timesheet-${periodStart}-${resourceId}.json`,
+    content,
+  })
+
+  const created = await commitResource(event)
+  log?.info?.(`[timesheets] Created timesheet ${resourceId}`)
+
+  return toTimesheetDto({ id: resourceId, content, ...created })
+}

package/src/delete.action.js

@@ -0,0 +1,5 @@
+export const metadata = {
+  id: '@ossy/timesheets/actions/delete',
+  access: 'workspace',
+  label: 'timesheets.delete',
+}

package/src/delete.task.js

@@ -0,0 +1,42 @@
+import { ResourcesEvents, mutateResource, viewResource } from '@ossy/resources/server'
+import { TimesheetsSchema } from './schema-ids.js'
+
+export const metadata = { id: '@ossy/timesheets/tasks/delete' }
+
+/**
+ * Delete a timesheet. Payload: `{ timesheetId }`
+ */
+export async function run ({ payload, req, log }) {
+  const workspaceId = req?.workspaceId
+
+  if (!workspaceId) {
+    throw Object.assign(new Error('workspaceId is required'), { status: 400 })
+  }
+
+  const timesheetId = payload?.timesheetId
+
+  if (!timesheetId) {
+    throw Object.assign(new Error('timesheetId is required'), { status: 400 })
+  }
+
+  const resource = await viewResource(timesheetId)
+
+  if (!resource || resource.type !== TimesheetsSchema.timesheet) {
+    throw Object.assign(new Error('timesheet not found'), { status: 404 })
+  }
+
+  if (resource.belongsTo && resource.belongsTo !== workspaceId) {
+    throw Object.assign(new Error('timesheet not found'), { status: 404 })
+  }
+
+  log?.info(`[timesheets/tasks/delete] Deleting timesheet ${timesheetId}`)
+
+  await mutateResource(
+    timesheetId,
+    ResourcesEvents.Deleted({
+      createdBy: req?.userId ?? 'system',
+    }),
+  )
+
+  return { id: timesheetId, deleted: true }
+}

package/src/download-timesheet-csv.js

@@ -1,8 +1,14 @@
 import { formatDateKey } from './build-prefilled-lines.js'
 
+function csvCell (value) {
+  const text = String(value ?? '')
+  if (/[",\n]/.test(text)) return `"${text.replace(/"/g, '""')}"`
+  return text
+}
+
 /**
  * Build a CSV string for a timesheet and trigger a browser download.
- * @param {{ periodStart?: number, periodEnd?: number, status?: string, lines?: Array<{ date: number, hours: number }> }} timesheet
+ * @param {{ periodStart?: number, periodEnd?: number, status?: string, lines?: Array<{ date: number, hours: number }>, clientName?: string, hourlyRate?: number }} timesheet
  * @param {string} [filename]
  */
 export function downloadTimesheetCsv (timesheet, filename) {
@@ -12,6 +18,19 @@ export function downloadTimesheetCsv (timesheet, filename) {
   if (timesheet?.periodStart != null && timesheet?.periodEnd != null) {
     headerRows.push(`# period,${formatDateKey(timesheet.periodStart)},${formatDateKey(timesheet.periodEnd)}`)
     headerRows.push(`# status,${timesheet.status ?? ''}`)
+    const employeeId = timesheet.employeeId?.resourceId ?? timesheet.employeeId
+    const contractId = timesheet.contractId?.resourceId ?? timesheet.contractId
+    if (employeeId) headerRows.push(`# employee,${csvCell(employeeId)}`)
+    if (timesheet.clientName) headerRows.push(`# client,${csvCell(timesheet.clientName)}`)
+    if (contractId) headerRows.push(`# contract,${csvCell(contractId)}`)
+    if (timesheet.hourlyRate != null && timesheet.hourlyRate !== '') {
+      const rate = Number(timesheet.hourlyRate)
+      if (Number.isFinite(rate)) {
+        const totalHours = lines.reduce((sum, line) => sum + (Number(line.hours) || 0), 0)
+        headerRows.push(`# hourlyRate,${rate}`)
+        headerRows.push(`# totalCost,${totalHours * rate}`)
+      }
+    }
   }
 
   const rows = [

package/src/en.translations.json

@@ -35,9 +35,15 @@
   "timesheets.createDescription": "Choose a month and holiday calendar to generate a prefilled timesheet.",
   "timesheets.period": "Period",
   "timesheets.holidayLocale": "Holiday calendar",
+  "timesheets.employee": "Assigned to",
+  "timesheets.employeeNone": "Unassigned",
+  "timesheets.contract": "Contract",
+  "timesheets.contractNone": "No contract",
+  "@ossy/timesheets/schema/timesheet.employeeId.label": "Assigned to",
+  "@ossy/timesheets/schema/timesheet.employeeId.description": "Optional. Who this timesheet is assigned to.",
+  "@ossy/timesheets/schema/timesheet.contractId.label": "Contract",
+  "@ossy/timesheets/schema/timesheet.contractId.description": "Optional. The contract this timesheet belongs to.",
   "timesheets.generate": "Generate",
-  "timesheets.openExisting": "Open",
-  "timesheets.periodExistsHint": "A timesheet already exists for this period — Open loads it.",
   "timesheets.cancel": "Cancel",
   "timesheets.save": "Save",
   "timesheets.saving": "Saving…",
@@ -52,13 +58,26 @@
   "timesheets.listTitle": "Your timesheets",
   "timesheets.listEmpty": "No timesheets yet. Click New to generate one for a month.",
   "timesheets.open": "Open",
+  "timesheets.view": "View",
+  "timesheets.rowActions": "Timesheet actions",
+  "timesheets.delete": "Delete",
+  "timesheets.deleteTitle": "Delete timesheet?",
+  "timesheets.deleteText": "This timesheet will be removed. This cannot be undone.",
   "timesheets.backToList": "← All timesheets",
+  "timesheets.closePanel": "Close",
   "timesheets.saved": "Timesheet saved.",
   "timesheets.unsaved": "Unsaved changes",
   "timesheets.statusLabel": "Status: {status}",
   "timesheets.status.draft": "Draft",
   "timesheets.status.saved": "Saved",
   "timesheets.totalHours": "Total: {hours} h",
+  "timesheets.meta.status": "Status",
+  "timesheets.meta.hoursValue": "{hours} h",
+  "timesheets.meta.client": "Client",
+  "timesheets.meta.hourlyRate": "Hourly rate",
+  "timesheets.meta.totalCost": "Total cost",
+  "timesheets.meta.perHour": "/h",
+  "timesheets.meta.dash": "—",
   "timesheets.weekday.mon": "Mon",
   "timesheets.weekday.tue": "Tue",
   "timesheets.weekday.wed": "Wed",
@@ -70,5 +89,6 @@
   "timesheets.errorNotFound": "Timesheet not found.",
   "timesheets.errorGenerate": "Could not generate timesheet.",
   "timesheets.errorSave": "Could not save timesheet.",
-  "timesheets.errorExport": "Could not export timesheet."
+  "timesheets.errorExport": "Could not export timesheet.",
+  "timesheets.errorDelete": "Could not delete timesheet."
 }

package/src/generate.task.js

@@ -1,24 +1,16 @@
-import { nanoid } from 'nanoid'
-import { ResourcesEvents, commitResource, mutateResource } from '@ossy/resources/server'
-import { TimesheetsSchema } from './schema-ids.js'
-import { timesheets } from './locations.js'
-import { buildPrefilledLines, monthPeriodBounds } from './build-prefilled-lines.js'
-import { DEFAULT_HOLIDAY_LOCALE, resolveHolidayLocale } from './holiday-locale.js'
-import {
-  findTimesheetForPeriod,
-  getTimesheetResources,
-  toTimesheetDto,
-} from './timesheet-resources.js'
+import { monthPeriodBounds } from './billing-period.js'
+import { createTimesheetDraft } from './create-timesheet-draft.js'
 
 export const metadata = { id: '@ossy/timesheets/tasks/generate' }
 
 /**
- * Generate (or load) a timesheet for a calendar month.
+ * Generate a new timesheet for a calendar month.
  *
- * Payload: `{ year, monthIndex, locale? }` (monthIndex 0–11) OR `{ periodStart, periodEnd, locale? }`.
+ * Payload: `{ year, monthIndex, locale?, employeeId?, contractId? }` (monthIndex 0–11)
+ * OR `{ periodStart, periodEnd, locale?, employeeId?, contractId? }`.
  * `locale` is an ISO country code or BCP 47 tag used for workday/holiday prefill.
- * If a saved sheet exists for the period, returns it without regenerating.
- * If a draft exists, regenerates prefilled lines (keeps id).
+ * Always creates a new draft — multiple sheets may share the same period.
+ * Optional `employeeId` / `contractId` are stored as `{ resourceId }` references.
  */
 export async function run ({ payload, req, log }) {
   const workspaceId = req?.workspaceId
@@ -40,64 +32,14 @@ export async function run ({ payload, req, log }) {
     ;({ periodStart, periodEnd } = monthPeriodBounds(Number(year), Number(monthIndex)))
   }
 
-  periodStart = Number(periodStart)
-  periodEnd = Number(periodEnd)
-
-  if (!Number.isFinite(periodStart) || !Number.isFinite(periodEnd) || periodEnd < periodStart) {
-    throw Object.assign(new Error('invalid period'), { status: 400 })
-  }
-
-  const holidayLocale = resolveHolidayLocale(payloadLocale, DEFAULT_HOLIDAY_LOCALE)
-
-  log?.info(
-    `[timesheets/tasks/generate] period ${periodStart}–${periodEnd} for workspace ${workspaceId} (locale ${holidayLocale})`,
-  )
-
-  const resources = await getTimesheetResources({
-    schemaId: TimesheetsSchema.timesheet,
-    belongsTo: workspaceId,
-  })
-  const existing = findTimesheetForPeriod(resources, periodStart)
-
-  if (existing?.content?.status === 'saved') {
-    log?.info(`[timesheets/tasks/generate] Returning saved timesheet ${existing.id}`)
-    return toTimesheetDto(existing)
-  }
-
-  const lines = buildPrefilledLines(periodStart, periodEnd, holidayLocale)
-  const content = {
+  return createTimesheetDraft({
+    workspaceId,
     periodStart,
     periodEnd,
-    status: 'draft',
-    holidayLocale,
-    lines,
-  }
-
-  if (existing) {
-    log?.info(`[timesheets/tasks/generate] Regenerating draft ${existing.id}`)
-    await mutateResource(
-      existing.id,
-      ResourcesEvents.Patched({
-        createdBy: req?.userId ?? 'system',
-        content,
-      }),
-    )
-    return toTimesheetDto({ ...existing, content })
-  }
-
-  const resourceId = nanoid()
-  const event = ResourcesEvents.Created({
-    resourceId,
-    schemaId: TimesheetsSchema.timesheet,
+    locale: payloadLocale,
+    employeeId: payload?.employeeId,
+    contractId: payload?.contractId,
     createdBy: req?.userId ?? 'system',
-    belongsTo: workspaceId,
-    location: timesheets,
-    name: `timesheet-${periodStart}.json`,
-    content,
+    log,
   })
-
-  const created = await commitResource(event)
-  log?.info(`[timesheets/tasks/generate] Created timesheet ${resourceId}`)
-
-  return toTimesheetDto({ id: resourceId, content, ...created })
 }

package/src/get.task.js

@@ -9,7 +9,7 @@ import {
 export const metadata = { id: '@ossy/timesheets/tasks/get' }
 
 /**
- * Get a timesheet by `{ timesheetId }` or `{ periodStart }`.
+ * Get a timesheet by `{ timesheetId }` or `{ periodStart }` (newest sheet for that period).
  */
 export async function run ({ payload, req, log }) {
   const workspaceId = req?.workspaceId

package/src/index.js

@@ -1,5 +1,5 @@
 export { Definition } from './Definition.js'
-export { TimesheetsSchema } from './schema-ids.js'
+export { TimesheetsSchema, TimesheetRefs } from './schema-ids.js'
 export {
   location,
   timesheets,
@@ -9,15 +9,26 @@ export { metadata as GenerateTimesheet } from './generate.action.js'
 export { metadata as SaveTimesheet } from './save.action.js'
 export { metadata as ListTimesheets } from './list.action.js'
 export { metadata as GetTimesheet } from './get.action.js'
+export { metadata as DeleteTimesheet } from './delete.action.js'
 export { metadata as OpenNewTimesheet } from './open-new.action.js'
 export { invokeErrorMessage } from './invoke-error-message.js'
 export { downloadTimesheetCsv } from './download-timesheet-csv.js'
 export { downloadTimesheetImage } from './download-timesheet-image.js'
 export { downloadTimesheetPdf } from './download-timesheet-pdf.js'
 export { buildPrefilledLines, monthPeriodBounds, WORKDAY_HOURS } from './build-prefilled-lines.js'
+export {
+  BILLING_PERIODS,
+  DEFAULT_BILLING_PERIOD,
+  findTimesheetForContractPeriod,
+  isContractActive,
+  normalizeBillingPeriod,
+  periodForContract,
+  weekPeriodBounds,
+} from './billing-period.js'
 export { resolveHolidayLocale, DEFAULT_HOLIDAY_LOCALE, HOLIDAY_COUNTRY_CODES } from './holiday-locale.js'
 export { Timesheet } from './Timesheet.jsx'
 export { TimesheetExportCard } from './TimesheetExportCard.jsx'
 export { TimesheetsFreeTool } from './TimesheetsFreeTool.jsx'
 export { TIMESHEET_EXPORT_BASE_BG } from './export-capture.js'
 export { TimesheetCard } from './TimesheetCard.jsx'
+export { TimesheetPanel } from './TimesheetPanel.jsx'