@open-mercato/core 0.6.4-develop.4210.1.d412061cfe → 0.6.4-develop.4236.1.9fa6806b34

package/src/modules/staff/migrations/Migration20260326135612.ts

@@ -0,0 +1,26 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260326135612 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`create table "staff_time_entries" ("id" uuid not null default gen_random_uuid(), "tenant_id" uuid not null, "organization_id" uuid not null, "staff_member_id" uuid not null, "date" date not null, "duration_minutes" int not null default 0, "started_at" timestamptz null, "ended_at" timestamptz null, "notes" text null, "time_project_id" uuid null, "customer_id" uuid null, "deal_id" uuid null, "order_id" uuid null, "source" text check ("source" in ('manual', 'timer', 'kiosk', 'mobile')) not null default 'manual', "created_at" timestamptz not null, "updated_at" timestamptz not null, "deleted_at" timestamptz null, constraint "staff_time_entries_pkey" primary key ("id"));`);
+    this.addSql(`create index "staff_time_entries_project_date_idx" on "staff_time_entries" ("organization_id", "time_project_id", "date");`);
+    this.addSql(`create index "staff_time_entries_member_date_idx" on "staff_time_entries" ("organization_id", "staff_member_id", "date");`);
+    this.addSql(`create index "staff_time_entries_tenant_org_idx" on "staff_time_entries" ("tenant_id", "organization_id");`);
+
+    this.addSql(`create table "staff_time_entry_segments" ("id" uuid not null default gen_random_uuid(), "tenant_id" uuid not null, "organization_id" uuid not null, "time_entry_id" uuid not null, "started_at" timestamptz not null, "ended_at" timestamptz null, "segment_type" text check ("segment_type" in ('work', 'break')) not null default 'work', "created_at" timestamptz not null, "updated_at" timestamptz not null, "deleted_at" timestamptz null, constraint "staff_time_entry_segments_pkey" primary key ("id"));`);
+    this.addSql(`create index "staff_time_entry_segments_entry_idx" on "staff_time_entry_segments" ("time_entry_id");`);
+    this.addSql(`create index "staff_time_entry_segments_tenant_org_idx" on "staff_time_entry_segments" ("tenant_id", "organization_id");`);
+
+    this.addSql(`create table "staff_time_projects" ("id" uuid not null default gen_random_uuid(), "tenant_id" uuid not null, "organization_id" uuid not null, "name" text not null, "customer_id" uuid null, "code" text not null, "description" text null, "project_type" text null, "status" text check ("status" in ('active', 'on_hold', 'completed')) not null default 'active', "owner_user_id" uuid null, "cost_center" text null, "start_date" date null, "created_at" timestamptz not null, "updated_at" timestamptz not null, "deleted_at" timestamptz null, constraint "staff_time_projects_pkey" primary key ("id"));`);
+    this.addSql(`create index "staff_time_projects_code_unique_idx" on "staff_time_projects" ("organization_id", "tenant_id", "code");`);
+    this.addSql(`create index "staff_time_projects_tenant_org_idx" on "staff_time_projects" ("tenant_id", "organization_id");`);
+
+    this.addSql(`create table "staff_time_project_members" ("id" uuid not null default gen_random_uuid(), "tenant_id" uuid not null, "organization_id" uuid not null, "time_project_id" uuid not null, "staff_member_id" uuid not null, "role" text null, "status" text check ("status" in ('active', 'inactive')) not null default 'active', "assigned_start_date" date not null, "assigned_end_date" date null, "created_at" timestamptz not null, "updated_at" timestamptz not null, "deleted_at" timestamptz null, constraint "staff_time_project_members_pkey" primary key ("id"));`);
+    this.addSql(`create index "staff_time_project_members_unique_idx" on "staff_time_project_members" ("organization_id", "tenant_id", "time_project_id", "staff_member_id");`);
+    this.addSql(`create index "staff_time_project_members_member_idx" on "staff_time_project_members" ("organization_id", "staff_member_id");`);
+    this.addSql(`create index "staff_time_project_members_project_idx" on "staff_time_project_members" ("organization_id", "time_project_id");`);
+    this.addSql(`create index "staff_time_project_members_tenant_org_idx" on "staff_time_project_members" ("tenant_id", "organization_id");`);
+  }
+
+}

package/src/modules/staff/migrations/Migration20260413102715.ts

@@ -0,0 +1,25 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260413102715 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "staff_time_project_members" add column "show_in_grid" boolean not null default false;`);
+    // Backfill: preserve grid visibility for memberships that already have time entries,
+    // so existing users don't lose rows the first time the new visibility filter is applied.
+    this.addSql(`
+      update "staff_time_project_members" m
+      set "show_in_grid" = true
+      where exists (
+        select 1 from "staff_time_entries" e
+        where e."time_project_id" = m."time_project_id"
+          and e."staff_member_id" = m."staff_member_id"
+          and e."deleted_at" is null
+      );
+    `);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "staff_time_project_members" drop column "show_in_grid";`);
+  }
+
+}

package/src/modules/staff/migrations/Migration20260413111602.ts

@@ -0,0 +1,13 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260413111602 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "staff_time_projects" add column "color" varchar(20) null;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "staff_time_projects" drop column "color";`);
+  }
+
+}

package/src/modules/staff/migrations/Migration20260511112759.ts

@@ -0,0 +1,21 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260511112759 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`drop index if exists "staff_time_projects_code_unique_idx";`);
+    this.addSql(`create unique index "staff_time_projects_code_unique_idx" on "staff_time_projects" ("organization_id", "tenant_id", "code") where "deleted_at" is null;`);
+
+    this.addSql(`drop index if exists "staff_time_project_members_unique_idx";`);
+    this.addSql(`create unique index "staff_time_project_members_unique_idx" on "staff_time_project_members" ("organization_id", "tenant_id", "time_project_id", "staff_member_id") where "deleted_at" is null;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop index if exists "staff_time_project_members_unique_idx";`);
+    this.addSql(`create index "staff_time_project_members_unique_idx" on "staff_time_project_members" ("organization_id", "tenant_id", "time_project_id", "staff_member_id");`);
+
+    this.addSql(`drop index if exists "staff_time_projects_code_unique_idx";`);
+    this.addSql(`create index "staff_time_projects_code_unique_idx" on "staff_time_projects" ("organization_id", "tenant_id", "code");`);
+  }
+
+}

package/src/modules/staff/search.ts

@@ -188,6 +188,41 @@ export const searchConfig: SearchModuleConfig = {
         searchable: ['name', 'description', 'appearance_icon', 'appearance_color'],
       },
     },
+    {
+      entityId: 'staff:staff_time_project',
+      enabled: true,
+      priority: 7,
+      buildSource: async (ctx) => {
+        const { t } = await resolveTranslations()
+        const record = ctx.record
+        const lines: string[] = []
+        appendLine(lines, 'Name', record.name)
+        appendLine(lines, 'Code', record.code)
+        appendLine(lines, 'Description', record.description)
+        appendLine(lines, 'Type', record.project_type ?? record.projectType)
+        appendLine(lines, 'Cost Center', record.cost_center ?? record.costCenter)
+        const presenter: SearchResultPresenter = {
+          title: String(record.name ?? record.id ?? t('staff.search.badge.timeProject', 'Project')),
+          subtitle: formatSubtitle(record.code, record.project_type ?? record.projectType),
+          icon: 'clock',
+          badge: t('staff.search.badge.timeProject', 'Project'),
+        }
+        return buildIndexSource(ctx, presenter, lines)
+      },
+      formatResult: async (ctx) => {
+        const { t } = await resolveTranslations()
+        return {
+          title: String(ctx.record.name ?? ctx.record.id ?? ''),
+          subtitle: formatSubtitle(ctx.record.code, ctx.record.project_type ?? ctx.record.projectType),
+          icon: 'clock',
+          badge: t('staff.search.badge.timeProject', 'Project'),
+        }
+      },
+      resolveUrl: async (ctx) => `/backend/staff/timesheets/projects/${encodeURIComponent(String(ctx.record.id))}`,
+      fieldPolicy: {
+        searchable: ['name', 'code', 'description', 'project_type', 'cost_center'],
+      },
+    },
   ],
 }
 

package/src/modules/staff/setup.ts

@@ -1,10 +1,22 @@
 import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'
+import { appendWidgetsToRoles } from '@open-mercato/core/modules/dashboards/lib/role-widgets'
 import { seedStaffAddressTypes, seedStaffTeamExamples } from './lib/seeds'
 
+const TIMESHEETS_DASHBOARD_WIDGET_IDS = [
+  'staff.timesheets.timeReporting',
+  'staff.timesheets.hoursByProject',
+]
+
 export const setup: ModuleSetupConfig = {
   seedDefaults: async (ctx) => {
     const scope = { tenantId: ctx.tenantId, organizationId: ctx.organizationId }
     await seedStaffAddressTypes(ctx.em, scope)
+    await appendWidgetsToRoles(ctx.em, {
+      tenantId: ctx.tenantId,
+      organizationId: ctx.organizationId,
+      roleNames: ['superadmin', 'admin', 'employee'],
+      widgetIds: TIMESHEETS_DASHBOARD_WIDGET_IDS,
+    })
   },
 
   seedExamples: async (ctx) => {
@@ -20,6 +32,9 @@ export const setup: ModuleSetupConfig = {
       'staff.my_availability.manage',
       'staff.my_leave_requests.view',
       'staff.my_leave_requests.send',
+      'staff.timesheets.view',
+      'staff.timesheets.manage_own',
+      'staff.timesheets.projects.view',
     ],
   },
 }

package/src/modules/staff/widgets/dashboard/timesheets-hours-by-project/config.ts

@@ -0,0 +1,17 @@
+import { type DateRangePreset, isValidDateRangePreset } from '@open-mercato/ui/backend/date-range'
+
+export type HoursByProjectSettings = {
+  dateRange: DateRangePreset
+}
+
+export const DEFAULT_SETTINGS: HoursByProjectSettings = {
+  dateRange: 'this_month',
+}
+
+export function hydrateSettings(raw: unknown): HoursByProjectSettings {
+  if (!raw || typeof raw !== 'object') return { ...DEFAULT_SETTINGS }
+  const obj = raw as Record<string, unknown>
+  return {
+    dateRange: isValidDateRangePreset(obj.dateRange) ? obj.dateRange : DEFAULT_SETTINGS.dateRange,
+  }
+}

package/src/modules/staff/widgets/dashboard/timesheets-hours-by-project/widget.client.tsx

@@ -0,0 +1,158 @@
+"use client"
+
+import * as React from 'react'
+import type { DashboardWidgetComponentProps } from '@open-mercato/shared/modules/dashboard/widgets'
+import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
+import {
+  DateRangeSelect,
+  InlineDateRangeSelect,
+  type DateRangePreset,
+} from '@open-mercato/ui/backend/date-range'
+import { DEFAULT_SETTINGS, hydrateSettings, type HoursByProjectSettings } from './config'
+
+type WidgetDataItem = { groupKey: string; groupLabel?: string; value: number | null }
+type WidgetDataResponse = {
+  value: number | null
+  data: WidgetDataItem[]
+  metadata: { fetchedAt: string; recordCount: number }
+}
+
+function minutesToHours(minutes: number): string {
+  const hours = minutes / 60
+  return hours % 1 === 0 ? String(hours) : hours.toFixed(1)
+}
+
+async function fetchData(settings: HoursByProjectSettings): Promise<WidgetDataResponse> {
+  const body = {
+    entityType: 'staff:staff_time_entries',
+    metric: { field: 'durationMinutes', aggregate: 'sum' },
+    groupBy: { field: 'timeProjectId', limit: 20, resolveLabels: true },
+    dateRange: { field: 'date', preset: settings.dateRange },
+  }
+
+  const res = await apiCall<WidgetDataResponse>('/api/dashboards/widgets/data', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(body),
+  })
+
+  if (!res.ok) {
+    const err = (res.result as Record<string, unknown>)?.error
+    throw new Error(typeof err === 'string' ? err : 'Failed to fetch data')
+  }
+
+  return res.result as WidgetDataResponse
+}
+
+const HoursByProjectWidget: React.FC<DashboardWidgetComponentProps<HoursByProjectSettings>> = ({
+  mode,
+  settings = DEFAULT_SETTINGS,
+  onSettingsChange,
+  refreshToken,
+  onRefreshStateChange,
+}) => {
+  const t = useT()
+  const hydrated = React.useMemo(() => hydrateSettings(settings), [settings])
+  const [data, setData] = React.useState<WidgetDataItem[]>([])
+  const [totalMinutes, setTotalMinutes] = React.useState(0)
+  const [loading, setLoading] = React.useState(true)
+  const [error, setError] = React.useState<string | null>(null)
+
+  const refresh = React.useCallback(async () => {
+    onRefreshStateChange?.(true)
+    setLoading(true)
+    setError(null)
+    try {
+      const result = await fetchData(hydrated)
+      const sorted = [...result.data].sort((a, b) => (b.value ?? 0) - (a.value ?? 0))
+      setData(sorted)
+      setTotalMinutes(sorted.reduce((sum, item) => sum + (item.value ?? 0), 0))
+    } catch (err) {
+      console.error('staff.timesheets.hoursByProject', err)
+      setError(t('staff.timesheets.widgets.hoursByProject.error', 'Failed to load data'))
+    } finally {
+      setLoading(false)
+      onRefreshStateChange?.(false)
+    }
+  }, [hydrated, onRefreshStateChange, t])
+
+  React.useEffect(() => {
+    void refresh()
+  }, [refresh, refreshToken])
+
+  if (mode === 'settings') {
+    return (
+      <div className="space-y-4 text-sm">
+        <DateRangeSelect
+          id="hours-by-project-date-range"
+          label={t('staff.timesheets.widgets.hoursByProject.settings.dateRange', 'Date Range')}
+          value={hydrated.dateRange}
+          onChange={(dateRange: DateRangePreset) => onSettingsChange({ ...hydrated, dateRange })}
+        />
+      </div>
+    )
+  }
+
+  if (loading) {
+    return (
+      <div className="flex h-full items-center justify-center py-8">
+        <p className="text-sm text-muted-foreground">{t('staff.timesheets.widgets.hoursByProject.loading', 'Loading...')}</p>
+      </div>
+    )
+  }
+
+  if (error) {
+    return (
+      <div className="flex h-full items-center justify-center py-8">
+        <p className="text-sm text-destructive">{error}</p>
+      </div>
+    )
+  }
+
+  const maxValue = data.length > 0 ? Math.max(...data.map((d) => d.value ?? 0)) : 0
+
+  return (
+    <div className="space-y-3">
+      <div className="flex items-center justify-end">
+        <InlineDateRangeSelect
+          value={hydrated.dateRange}
+          onChange={(dateRange) => onSettingsChange({ ...hydrated, dateRange })}
+        />
+      </div>
+
+      {data.length === 0 ? (
+        <p className="py-4 text-center text-sm text-muted-foreground">
+          {t('staff.timesheets.widgets.hoursByProject.empty', 'No hours tracked in this period.')}
+        </p>
+      ) : (
+        <div className="space-y-2.5">
+          {data.map((item) => {
+            const barWidth = maxValue > 0 ? ((item.value ?? 0) / maxValue) * 100 : 0
+            return (
+              <div key={item.groupKey} className="space-y-1">
+                <div className="flex items-center justify-between text-sm">
+                  <span className="truncate font-medium">{item.groupLabel || item.groupKey}</span>
+                  <span className="shrink-0 tabular-nums text-muted-foreground">{minutesToHours(item.value ?? 0)} h</span>
+                </div>
+                <div className="h-2 w-full rounded-full bg-muted">
+                  <div
+                    className="h-2 rounded-full bg-primary transition-all"
+                    style={{ width: `${barWidth}%` }}
+                  />
+                </div>
+              </div>
+            )
+          })}
+
+          <div className="flex items-center justify-between border-t pt-2 text-sm font-semibold">
+            <span>{t('staff.timesheets.widgets.hoursByProject.total', 'Total')}</span>
+            <span className="tabular-nums">{minutesToHours(totalMinutes)} h</span>
+          </div>
+        </div>
+      )}
+    </div>
+  )
+}
+
+export default HoursByProjectWidget

package/src/modules/staff/widgets/dashboard/timesheets-hours-by-project/widget.ts

@@ -0,0 +1,25 @@
+import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import { DEFAULT_SETTINGS, hydrateSettings, type HoursByProjectSettings } from './config'
+
+const HoursByProjectWidget = lazyDashboardWidget(() => import('./widget.client'))
+
+const widget: DashboardWidgetModule<HoursByProjectSettings> = {
+  metadata: {
+    id: 'staff.timesheets.hoursByProject',
+    title: 'Hours by Project',
+    description: 'Tracked hours grouped by project for a selected period',
+    features: ['dashboards.view', 'analytics.view', 'staff.timesheets.view'],
+    defaultSize: 'md',
+    defaultEnabled: false,
+    defaultSettings: DEFAULT_SETTINGS,
+    tags: ['analytics', 'staff', 'timesheets'],
+    category: 'analytics',
+    icon: 'clock',
+    supportsRefresh: true,
+  },
+  Widget: HoursByProjectWidget,
+  hydrateSettings,
+  dehydrateSettings: (s) => ({ dateRange: s.dateRange }),
+}
+
+export default widget

package/src/modules/staff/widgets/dashboard/timesheets-time-reporting/config.ts

@@ -0,0 +1,15 @@
+export type TimeReportingSettings = {
+  lastProjectId: string | null
+}
+
+export const DEFAULT_SETTINGS: TimeReportingSettings = {
+  lastProjectId: null,
+}
+
+export function hydrateSettings(raw: unknown): TimeReportingSettings {
+  if (!raw || typeof raw !== 'object') return { ...DEFAULT_SETTINGS }
+  const obj = raw as Record<string, unknown>
+  return {
+    lastProjectId: typeof obj.lastProjectId === 'string' ? obj.lastProjectId : null,
+  }
+}