diff --git a/apps/api/src/routines/routine-mapper.ts b/apps/api/src/routines/routine-mapper.ts index 4b28edb..a391942 100644 --- a/apps/api/src/routines/routine-mapper.ts +++ b/apps/api/src/routines/routine-mapper.ts @@ -41,6 +41,7 @@ export type RoutineTaskRow = Prisma.RoutineTaskGetPayload<{ export const routineInclude = { category: true, assignee: userSelect, + createdBy: userSelect, team: { select: { id: true, name: true } }, } satisfies Prisma.RoutineInclude; @@ -186,6 +187,7 @@ export function toRoutineDto( reminderMinutesBefore: row.reminderMinutesBefore, isActive: row.isActive, createdById: row.createdById, + createdBy: row.createdBy, recurrenceLabel: describeRecurrence(rule), executionRate: execution.total ? Math.round((execution.done / execution.total) * 100) : null, executionTotal: execution.total, diff --git a/apps/web/src/views/routines/RoutinesManageView.vue b/apps/web/src/views/routines/RoutinesManageView.vue index 083e314..519f5bf 100644 --- a/apps/web/src/views/routines/RoutinesManageView.vue +++ b/apps/web/src/views/routines/RoutinesManageView.vue @@ -259,6 +259,7 @@ const teams = computed(() => shell.context.value?.teams ?? []); عنوان مسئول + سازنده تکرار ساعت وضعیت @@ -288,6 +289,13 @@ const teams = computed(() => shell.context.value?.teams ?? []); {{ r.assignee.fullName }} + + + + {{ r.createdBy.fullName }} + + — + {{ r.recurrenceLabel }} {{ toFaDigits(r.timeOfDay) }} diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts index c294fac..0475a5d 100644 --- a/packages/shared/src/index.ts +++ b/packages/shared/src/index.ts @@ -6549,6 +6549,7 @@ export interface RoutineDto { isActive: boolean; /** سازندهٔ روتین؛ عضو عادی فقط روتین خودش را ویرایش می‌کند */ createdById: string | null; + createdBy: UserSummaryDto | null; recurrenceLabel: string; /** درصد اجرا در ۳۰ روز اخیر */ executionRate: number | null;