Mahdi/CRM_Montzar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Editing of the project's Kariz page

Browse Source
This commit is contained in:
Mahdi
2026-09-15 19:13:30 +03:30
parent 44f9849d0e
commit e61fad95c6
25 changed files with 1751 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/src/common/excel.ts
+10
View File
@@ -144,6 +144,16 @@ export function formatClock(d: Date | string | null | undefined) {
return `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
}
export function parseAmount(raw?: string): number | null {
const text = toAsciiDigits(raw ?? '')
.replace(/[,،]/g, '')
.replace(/\s+/g, '')
.trim();
if (!text) return null;
const n = Number(text.replace(/[^\d.-]/g, ''));
return Number.isFinite(n) ? n : null;
}
export function parseJalaliDateTime(dateRaw?: string, timeRaw?: string): Date | null {
const dateText = toAsciiDigits(dateRaw ?? '').trim();
if (!dateText) return null;
apps/api/src/pipelines/deals-excel.service.ts
+319
View File
@@ -0,0 +1,319 @@
import { Injectable } from '@nestjs/common';
import type { DealStatus, ImportContactsResult } from '@mento/shared';
import { Prisma } from '@prisma/client';
import { PrismaService } from '../prisma/prisma.service';
import type { Actor } from '../common/record-scope';
import { ownerWhere, resolveOwnerId } from '../common/record-scope';
import { toJsonCustomFields } from '../common/custom-fields';
import { normalizePhone } from '../contacts/normalize';
import {
formatJalaliDate,
parseAmount,
parseJalaliDateTime,
readMappedRows,
writeXlsx,
} from '../common/excel';
import { PipelinesService } from './pipelines.service';
const DEAL_COLUMNS = [
{ header: '_type', key: '_type', width: 12 },
{ header: 'کد دیدار معامله', key: 'didarId', width: 16 },
{ header: 'عنوان معامله', key: 'title', width: 28 },
{ header: 'مبلغ معامله', key: 'amount', width: 16 },
{ header: 'ارز معامله', key: 'currency', width: 12 },
{ header: 'وضعیت معامله', key: 'status', width: 14 },
{ header: 'مسئول معامله', key: 'ownerName', width: 18 },
{ header: 'مجوز مشاهده معامله', key: 'visibility', width: 18 },
{ header: 'تاریخ ثبت معامله', key: 'createdAt', width: 16 },
{ header: 'نام خانوادگی شخص معامله', key: 'personName', width: 22 },
{ header: 'کد دیدار شخص', key: 'personCode', width: 14 },
{ header: 'موبایل شخص معامله', key: 'personMobile', width: 16 },
{ header: 'نام شرکت معامله', key: 'companyName', width: 22 },
{ header: 'کاریز معامله', key: 'pipelineName', width: 20 },
{ header: 'مرحله کاریز معامله', key: 'stageName', width: 18 },
{ header: 'تاریخ انجام معامله', key: 'expectedCloseAt', width: 16 },
{ header: 'منبع معامله', key: 'source', width: 16 },
{ header: 'توضیحات معامله', key: 'notes', width: 32 },
{ header: 'برچسب', key: 'tags', width: 16 },
];
const DEAL_ALIASES: Record<string, string> = {
_type: '_type',
type: '_type',
کددیدارمعامله: 'didarId',
عنوانمعامله: 'title',
عنوان: 'title',
مبلغمعامله: 'amount',
مبلغ: 'amount',
ارزمعامله: 'currency',
ارز: 'currency',
وضعیتمعامله: 'status',
مسئولمعامله: 'ownerName',
مجوزمشاهدهمعامله: 'visibility',
تاریخثبتمعامله: 'createdAt',
نامخانوادگیشخصمعامله: 'personName',
کددیدارشخص: 'personCode',
موبایلشخصمعامله: 'personMobile',
نامشرکتمعامله: 'companyName',
شرکت: 'companyName',
کاریزمعامله: 'pipelineName',
کاریز: 'pipelineName',
مرحلهکاریزمعامله: 'stageName',
مرحله: 'stageName',
تاریخانجاممعامله: 'expectedCloseAt',
منبعمعامله: 'source',
منبع: 'source',
توضیحاتمعامله: 'notes',
توضیحات: 'notes',
برچسب: 'tags',
};
function statusLabel(status: DealStatus) {
if (status === 'won') return 'برنده';
if (status === 'lost') return 'از دست‌رفته';
return 'باز';
}
function parseStatus(raw?: string): DealStatus {
const v = (raw ?? '').trim();
if (/برنده|won|موفق/i.test(v)) return 'won';
if (/از\s*دست|باخت|lost|ناموفق/i.test(v)) return 'lost';
return 'open';
}
function parseTags(raw?: string) {
return (raw ?? '')
.split(/[،,|#]+/)
.map((t) => t.trim())
.filter(Boolean)
.slice(0, 20);
}
@Injectable()
export class DealsExcelService {
constructor(
private readonly prisma: PrismaService,
private readonly pipelines: PipelinesService,
) {}
async export(actor: Actor): Promise<Buffer> {
const rows = await this.prisma.deal.findMany({
where: { organizationId: actor.organizationId, ...ownerWhere(actor) },
include: {
person: {
select: { id: true, firstName: true, lastName: true, mobile: true },
},
company: { select: { name: true } },
owner: { select: { fullName: true } },
pipeline: { select: { name: true } },
stage: { select: { name: true } },
},
orderBy: [{ updatedAt: 'desc' }],
take: 10000,
});
return writeXlsx(
'Deal',
DEAL_COLUMNS,
rows.map((row) => {
const extra = (row.customFields ?? {}) as Record<string, string>;
return {
_type: 'Deal',
didarId: extra.didarId ?? row.id,
title: row.title,
amount: row.amount == null ? '' : Number(row.amount),
currency: row.currency,
status: statusLabel(row.status),
ownerName: row.owner?.fullName ?? '',
visibility: 'همه افراد شرکت',
createdAt: formatJalaliDate(row.createdAt),
personName: row.person
? `${row.person.firstName} ${row.person.lastName}`.trim()
: '',
personCode: row.person?.id ?? '',
personMobile: row.person?.mobile ?? '',
companyName: row.company?.name ?? '',
pipelineName: row.pipeline.name,
stageName: row.stage.name,
expectedCloseAt: formatJalaliDate(row.expectedCloseAt),
source: row.source ?? '',
notes: row.notes ?? '',
tags: (row.tags ?? []).join('، '),
};
}),
);
}
async import(actor: Actor, file: Express.Multer.File): Promise<ImportContactsResult> {
const rows = await readMappedRows(file, DEAL_ALIASES);
const result: ImportContactsResult = { created: 0, skipped: 0, errors: [] };
const affected = new Map<string, string>();
for (let i = 0; i < rows.length; i++) {
const row = rows[i]!;
const rowNum = i + 2;
if ((row._type || '').trim() && row._type.trim().toLowerCase() !== 'deal') {
continue;
}
const title = (row.title || '').trim();
if (title.length < 2) {
result.errors.push({ row: rowNum, message: 'عنوان معامله الزامی است' });
continue;
}
try {
const status = parseStatus(row.status);
const { pipelineId, stageId, pipelineName } = await this.resolvePipelineAndStage(
actor.organizationId,
row.pipelineName,
row.stageName,
status,
);
affected.set(pipelineId, pipelineName);
const duplicate = await this.prisma.deal.findFirst({
where: { organizationId: actor.organizationId, pipelineId, title },
select: { id: true },
});
if (duplicate) {
result.skipped += 1;
continue;
}
const personId = await this.findPersonId(actor.organizationId, row);
const companyId = await this.findCompanyId(actor.organizationId, row.companyName);
const ownerId =
(await this.findUserId(actor.organizationId, row.ownerName)) ??
resolveOwnerId(actor, null);
const amount = parseAmount(row.amount);
const expectedCloseAt = parseJalaliDateTime(row.expectedCloseAt);
const customFields: Record<string, string> = {};
if (row.didarId?.trim()) customFields.didarId = row.didarId.trim();
await this.prisma.deal.create({
data: {
organizationId: actor.organizationId,
pipelineId,
stageId,
title,
amount: amount == null ? null : new Prisma.Decimal(amount),
currency: (row.currency || 'IRR').trim() || 'IRR',
status,
source: row.source?.trim() || null,
notes: row.notes?.trim() || null,
tags: parseTags(row.tags),
customFields: toJsonCustomFields(customFields),
expectedCloseAt,
personId,
companyId,
ownerId,
},
});
result.created += 1;
} catch (e) {
result.errors.push({
row: rowNum,
message: e instanceof Error ? e.message : 'خطای ناشناخته',
});
}
}
const entries = [...affected.entries()];
if (entries[0]) {
result.boardId = entries[0][0];
result.boards = entries.map(([, n]) => n);
}
return result;
}
private async resolvePipelineAndStage(
organizationId: string,
pipelineName?: string,
stageName?: string,
status: DealStatus = 'open',
) {
const name = pipelineName?.trim() || 'کاریز فروش';
const wanted = stageName?.trim();
let pipeline = await this.prisma.pipeline.findFirst({
where: { organizationId, name: { equals: name, mode: 'insensitive' } },
include: { stages: { orderBy: { position: 'asc' } } },
});
if (!pipeline) {
const created = await this.pipelines.create(organizationId, name);
pipeline = await this.prisma.pipeline.findFirstOrThrow({
where: { id: created.id },
include: { stages: { orderBy: { position: 'asc' } } },
});
}
if (wanted) {
const existing = pipeline.stages.find(
(s) => s.name.trim().toLowerCase() === wanted.toLowerCase(),
);
if (existing) {
return { pipelineId: pipeline.id, stageId: existing.id, pipelineName: pipeline.name };
}
const added = await this.pipelines.createStage(organizationId, pipeline.id, wanted);
const stage = added.stages.find((s) => s.name === wanted) ?? added.stages.at(-1);
if (!stage) throw new Error('کاریز مرحله‌ای ندارد');
return { pipelineId: pipeline.id, stageId: stage.id, pipelineName: pipeline.name };
}
const byStatus =
status === 'won'
? pipeline.stages.find((s) => s.isWon)
: status === 'lost'
? pipeline.stages.find((s) => s.isLost)
: pipeline.stages.find((s) => !s.isWon && !s.isLost);
const stage = byStatus ?? pipeline.stages[0];
if (!stage) throw new Error('کاریز مرحله‌ای ندارد');
return { pipelineId: pipeline.id, stageId: stage.id, pipelineName: pipeline.name };
}
private async findPersonId(organizationId: string, row: Record<string, string>) {
const mobile = normalizePhone(row.personMobile);
if (mobile) {
const needle = mobile.replace(/^\+98|^98|^0/, '');
const byMobile = await this.prisma.person.findFirst({
where: { organizationId, mobile: { contains: needle } },
select: { id: true },
});
if (byMobile) return byMobile.id;
}
const name = (row.personName ?? '').trim();
if (name) {
const byName = await this.prisma.person.findFirst({
where: {
organizationId,
OR: [
{ lastName: { contains: name, mode: 'insensitive' } },
{ firstName: { contains: name.split(/\s+/)[0]!, mode: 'insensitive' } },
],
},
select: { id: true },
});
if (byName) return byName.id;
}
return null;
}
private async findCompanyId(organizationId: string, name?: string) {
const n = name?.trim();
if (!n) return null;
const row = await this.prisma.company.findFirst({
where: { organizationId, name: { equals: n, mode: 'insensitive' } },
select: { id: true },
});
return row?.id ?? null;
}
private async findUserId(organizationId: string, name?: string) {
const n = name?.trim();
if (!n) return null;
const row = await this.prisma.user.findFirst({
where: { organizationId, fullName: { contains: n, mode: 'insensitive' } },
select: { id: true },
});
return row?.id ?? null;
}
}
apps/api/src/pipelines/deals.controller.ts
+47 -8
View File
@@ -6,33 +6,72 @@ import {
Param,
Patch,
Post,
Res,
StreamableFile,
UploadedFile,
UseGuards,
UseInterceptors,
} from '@nestjs/common';
import { FileInterceptor } from '@nestjs/platform-express';
import { memoryStorage } from 'multer';
import type { Response } from 'express';
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
import { CurrentUser } from '../auth/current-user.decorator';
import type { Actor } from '../common/record-scope';
import { CreateDealDto, MoveDealDto, UpdateDealDto } from './dto';
import { DealsService } from './deals.service';
type AuthUser = { organizationId: string; userId: string; role: string };
import { DealsExcelService } from './deals-excel.service';
import { brand } from '@mento/shared';
@Controller('deals')
@UseGuards(JwtAuthGuard)
export class DealsController {
constructor(private readonly dealsService: DealsService) {}
constructor(
private readonly dealsService: DealsService,
private readonly excelService: DealsExcelService,
) {}
@Get('export')
async export(
@CurrentUser() user: Actor,
@Res({ passthrough: true }) res: Response,
) {
const buffer = await this.excelService.export(user);
res.set({
'Content-Type':
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'Content-Disposition': `attachment; filename="${brand.filePrefix}-deals.xlsx"`,
});
return new StreamableFile(buffer);
}
@Post('import')
@UseInterceptors(
FileInterceptor('file', {
storage: memoryStorage(),
limits: { fileSize: 15_000_000 },
}),
)
import(
@CurrentUser() user: Actor,
@UploadedFile() file: Express.Multer.File,
) {
return this.excelService.import(user, file);
}
@Get(':id')
get(@CurrentUser() user: AuthUser, @Param('id') id: string) {
get(@CurrentUser() user: Actor, @Param('id') id: string) {
return this.dealsService.get(user.organizationId, id, user);
}
@Post()
create(@CurrentUser() user: AuthUser, @Body() dto: CreateDealDto) {
create(@CurrentUser() user: Actor, @Body() dto: CreateDealDto) {
return this.dealsService.create(user.organizationId, user, dto);
}
@Patch(':id')
update(
@CurrentUser() user: AuthUser,
@CurrentUser() user: Actor,
@Param('id') id: string,
@Body() dto: UpdateDealDto,
) {
@@ -41,7 +80,7 @@ export class DealsController {
@Patch(':id/move')
move(
@CurrentUser() user: AuthUser,
@CurrentUser() user: Actor,
@Param('id') id: string,
@Body() dto: MoveDealDto,
) {
@@ -49,7 +88,7 @@ export class DealsController {
}
@Delete(':id')
async remove(@CurrentUser() user: AuthUser, @Param('id') id: string) {
async remove(@CurrentUser() user: Actor, @Param('id') id: string) {
await this.dealsService.remove(user.organizationId, id, user);
return { ok: true };
}
apps/api/src/pipelines/pipelines.module.ts
+2 -1
View File
@@ -1,6 +1,7 @@
import { Module, forwardRef } from '@nestjs/common';
import { DealsController } from './deals.controller';
import { DealsService } from './deals.service';
import { DealsExcelService } from './deals-excel.service';
import { PipelinesController } from './pipelines.controller';
import { PipelinesService } from './pipelines.service';
import { NotificationsModule } from '../notifications/notifications.module';
@@ -16,7 +17,7 @@ import { MessageAutomationsModule } from '../message-automations/message-automat
MessageAutomationsModule,
],
controllers: [PipelinesController, DealsController],
providers: [PipelinesService, DealsService],
providers: [PipelinesService, DealsService, DealsExcelService],
exports: [PipelinesService, DealsService],
})
export class PipelinesModule {}
apps/api/src/products/products-excel.service.ts
+172
View File
@@ -0,0 +1,172 @@
import { Injectable } from '@nestjs/common';
import type { ImportContactsResult } from '@mento/shared';
import { PrismaService } from '../prisma/prisma.service';
import {
parseAmount,
readMappedRows,
writeXlsx,
} from '../common/excel';
import { ProductsService } from './products.service';
const PRODUCT_COLUMNS = [
{ header: '_type', key: '_type', width: 12 },
{ header: 'نوع', key: 'kind', width: 12 },
{ header: 'نام محصول', key: 'name', width: 28 },
{ header: 'کد کالا', key: 'sku', width: 16 },
{ header: 'دسته‌بندی', key: 'category', width: 16 },
{ header: 'واحد', key: 'unit', width: 10 },
{ header: 'موجودی', key: 'stockQty', width: 12 },
{ header: 'برند', key: 'brand', width: 14 },
{ header: 'مدل', key: 'model', width: 14 },
{ header: 'کشور', key: 'country', width: 12 },
{ header: 'قیمت واحد', key: 'unitPrice', width: 14 },
{ header: 'ارز', key: 'currency', width: 10 },
{ header: 'وضعیت', key: 'active', width: 12 },
{ header: 'برچسب', key: 'tags', width: 16 },
{ header: 'توضیحات', key: 'description', width: 32 },
];
const PRODUCT_ALIASES: Record<string, string> = {
_type: '_type',
type: '_type',
نوع: 'kind',
ناممحصول: 'name',
نام: 'name',
نامکالا: 'name',
کدکالا: 'sku',
sku: 'sku',
کد: 'sku',
دستهبندی: 'category',
دسته: 'category',
واحد: 'unit',
موجودی: 'stockQty',
برند: 'brand',
مدل: 'model',
کشور: 'country',
قیمتواحد: 'unitPrice',
قیمت: 'unitPrice',
ارز: 'currency',
وضعیت: 'active',
فعال: 'active',
برچسب: 'tags',
توضیحات: 'description',
};
function kindLabel(kind: string) {
return kind === 'service' ? 'خدمت' : 'کالا';
}
function parseKind(raw?: string): 'product' | 'service' {
return /خدمت|service/i.test(raw ?? '') ? 'service' : 'product';
}
function parseActive(raw?: string) {
const v = (raw ?? '').trim();
if (!v) return true;
return !/غیرفعال|inactive|خیر|no|0/i.test(v);
}
function parseTags(raw?: string) {
return (raw ?? '')
.split(/[،,|#]+/)
.map((t) => t.trim())
.filter(Boolean)
.slice(0, 20);
}
@Injectable()
export class ProductsExcelService {
constructor(
private readonly prisma: PrismaService,
private readonly products: ProductsService,
) {}
async export(organizationId: string, q?: string): Promise<Buffer> {
const items = await this.products.list(organizationId, { q });
return writeXlsx(
'Product',
PRODUCT_COLUMNS,
items.map((p) => ({
_type: 'Product',
kind: kindLabel(p.kind),
name: p.name,
sku: p.sku ?? '',
category: p.category ?? '',
unit: p.unit ?? '',
stockQty: p.stockQty ?? '',
brand: p.brand ?? '',
model: p.model ?? '',
country: p.country ?? '',
unitPrice: p.unitPrice ?? '',
currency: p.currency,
active: p.isActive ? 'فعال' : 'غیرفعال',
tags: (p.tags ?? []).join('، '),
description: p.description ?? '',
})),
);
}
async import(
organizationId: string,
file: Express.Multer.File,
): Promise<ImportContactsResult> {
const rows = await readMappedRows(file, PRODUCT_ALIASES);
const result: ImportContactsResult = { created: 0, skipped: 0, errors: [] };
for (let i = 0; i < rows.length; i++) {
const row = rows[i]!;
const rowNum = i + 2;
if ((row._type || '').trim() && row._type.trim().toLowerCase() !== 'product') {
continue;
}
const name = (row.name || '').trim();
if (name.length < 1) {
result.errors.push({ row: rowNum, message: 'نام محصول الزامی است' });
continue;
}
const sku = row.sku?.trim() || undefined;
const duplicate = await this.prisma.product.findFirst({
where: {
organizationId,
OR: [
...(sku ? [{ sku: { equals: sku, mode: 'insensitive' as const } }] : []),
{ name: { equals: name, mode: 'insensitive' } },
],
},
select: { id: true },
});
if (duplicate) {
result.skipped += 1;
continue;
}
try {
await this.products.create(organizationId, {
name,
kind: parseKind(row.kind),
sku,
category: row.category || undefined,
unit: row.unit || undefined,
stockQty: parseAmount(row.stockQty),
brand: row.brand || undefined,
model: row.model || undefined,
country: row.country || undefined,
tags: parseTags(row.tags),
unitPrice: parseAmount(row.unitPrice),
currency: row.currency || undefined,
isActive: parseActive(row.active),
description: row.description || undefined,
});
result.created += 1;
} catch (e) {
result.errors.push({
row: rowNum,
message: e instanceof Error ? e.message : 'خطای ناشناخته',
});
}
}
return result;
}
}
apps/api/src/products/products.controller.ts
+44 -1
View File
@@ -7,19 +7,32 @@ import {
Patch,
Post,
Query,
Res,
StreamableFile,
UploadedFile,
UseGuards,
UseInterceptors,
} from '@nestjs/common';
import { FileInterceptor } from '@nestjs/platform-express';
import { memoryStorage } from 'multer';
import type { Response } from 'express';
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
import { CurrentUser } from '../auth/current-user.decorator';
import { Roles } from '../auth/roles.decorator';
import { RolesGuard } from '../auth/roles.guard';
import type { Actor } from '../common/record-scope';
import { CreateProductDto, ListProductsQueryDto, UpdateProductDto } from './dto';
import { ProductsService } from './products.service';
import { ProductsExcelService } from './products-excel.service';
import { brand } from '@mento/shared';
@Controller('products')
@UseGuards(JwtAuthGuard, RolesGuard)
export class ProductsController {
constructor(private readonly productsService: ProductsService) {}
constructor(
private readonly productsService: ProductsService,
private readonly excelService: ProductsExcelService,
) {}
@Get()
list(
@@ -34,6 +47,36 @@ export class ProductsController {
});
}
@Get('export')
async export(
@CurrentUser() user: Actor,
@Query('q') q: string | undefined,
@Res({ passthrough: true }) res: Response,
) {
const buffer = await this.excelService.export(user.organizationId, q);
res.set({
'Content-Type':
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'Content-Disposition': `attachment; filename="${brand.filePrefix}-products.xlsx"`,
});
return new StreamableFile(buffer);
}
@Post('import')
@Roles('owner', 'admin')
@UseInterceptors(
FileInterceptor('file', {
storage: memoryStorage(),
limits: { fileSize: 15_000_000 },
}),
)
import(
@CurrentUser() user: Actor,
@UploadedFile() file: Express.Multer.File,
) {
return this.excelService.import(user.organizationId, file);
}
@Get(':id')
getOne(
@CurrentUser() user: { organizationId: string },
apps/api/src/products/products.module.ts
+2 -1
View File
@@ -3,11 +3,12 @@ import { AuthModule } from '../auth/auth.module';
import { InventoryModule } from '../inventory/inventory.module';
import { ProductsController } from './products.controller';
import { ProductsService } from './products.service';
import { ProductsExcelService } from './products-excel.service';
@Module({
imports: [AuthModule, InventoryModule],
controllers: [ProductsController],
providers: [ProductsService],
providers: [ProductsService, ProductsExcelService],
exports: [ProductsService],
})
export class ProductsModule {}
apps/api/src/project-boards/dto.ts
+22
View File
@@ -1,5 +1,6 @@
import { Type } from 'class-transformer';
import {
IsArray,
IsNumber,
IsOptional,
IsString,
@@ -16,6 +17,27 @@ export class CreateProjectBoardDto {
name!: string;
}
export class CreateProjectBoardStageDto {
@IsString()
@MinLength(1)
@MaxLength(80)
name!: string;
}
export class UpdateProjectBoardStageDto {
@IsOptional()
@IsString()
@MinLength(1)
@MaxLength(80)
name?: string;
}
export class ReorderProjectBoardStagesDto {
@IsArray()
@IsString({ each: true })
stageIds!: string[];
}
export class CreateProjectCardDto {
@IsString()
@MinLength(2)
apps/api/src/project-boards/project-boards.controller.ts
+53
View File
@@ -23,8 +23,11 @@ import { RolesGuard } from '../auth/roles.guard';
import type { Actor } from '../common/record-scope';
import {
CreateProjectBoardDto,
CreateProjectBoardStageDto,
CreateProjectCardDto,
MoveProjectCardDto,
ReorderProjectBoardStagesDto,
UpdateProjectBoardStageDto,
UpdateProjectCardDto,
} from './dto';
import { ProjectBoardsService } from './project-boards.service';
@@ -61,6 +64,56 @@ export class ProjectBoardsController {
return this.boards.create(user.organizationId, dto.name);
}
@Post('project-boards/:boardId/stages')
@Roles('owner', 'admin')
createStage(
@CurrentUser() user: Actor,
@Param('boardId') boardId: string,
@Body() dto: CreateProjectBoardStageDto,
) {
return this.boards.createStage(user.organizationId, boardId, dto.name);
}
@Patch('project-boards/:boardId/stages/order')
@Roles('owner', 'admin')
reorderStages(
@CurrentUser() user: Actor,
@Param('boardId') boardId: string,
@Body() dto: ReorderProjectBoardStagesDto,
) {
return this.boards.reorderStages(
user.organizationId,
boardId,
dto.stageIds,
);
}
@Patch('project-boards/:boardId/stages/:stageId')
@Roles('owner', 'admin')
updateStage(
@CurrentUser() user: Actor,
@Param('boardId') boardId: string,
@Param('stageId') stageId: string,
@Body() dto: UpdateProjectBoardStageDto,
) {
return this.boards.updateStage(
user.organizationId,
boardId,
stageId,
dto.name,
);
}
@Delete('project-boards/:boardId/stages/:stageId')
@Roles('owner', 'admin')
deleteStage(
@CurrentUser() user: Actor,
@Param('boardId') boardId: string,
@Param('stageId') stageId: string,
) {
return this.boards.deleteStage(user.organizationId, boardId, stageId);
}
@Get('project-cards/export')
async exportCards(
@CurrentUser() user: Actor,
apps/api/src/project-boards/project-boards.service.ts
+108
View File
@@ -299,6 +299,114 @@ export class ProjectBoardsService {
await this.prisma.projectCard.delete({ where: { id } });
}
async createStage(
organizationId: string,
boardId: string,
name: string,
): Promise<ProjectBoardDto> {
const board = await this.getOwnedBoard(organizationId, boardId);
const trimmed = name.trim();
if (!trimmed) throw new BadRequestException('نام ستون لازم است');
await this.prisma.projectBoardStage.create({
data: {
boardId: board.id,
name: trimmed,
position: board.stages.length,
},
});
return this.getOwnedBoardDto(organizationId, board.id);
}
async updateStage(
organizationId: string,
boardId: string,
stageId: string,
name?: string,
): Promise<ProjectBoardDto> {
const board = await this.getOwnedBoard(organizationId, boardId);
const stage = board.stages.find((s) => s.id === stageId);
if (!stage) throw new NotFoundException('ستون پیدا نشد');
const trimmed = name?.trim() ?? '';
if (!trimmed) throw new BadRequestException('نام ستون لازم است');
await this.prisma.projectBoardStage.update({
where: { id: stage.id },
data: { name: trimmed },
});
return this.getOwnedBoardDto(organizationId, board.id);
}
async deleteStage(
organizationId: string,
boardId: string,
stageId: string,
): Promise<ProjectBoardDto> {
const board = await this.getOwnedBoard(organizationId, boardId);
const stage = board.stages.find((s) => s.id === stageId);
if (!stage) throw new NotFoundException('ستون پیدا نشد');
if (board.stages.length <= 1) {
throw new BadRequestException('حداقل یک ستون باید باقی بماند');
}
const cardCount = await this.prisma.projectCard.count({
where: { organizationId, stageId: stage.id },
});
if (cardCount > 0) {
throw new BadRequestException(
'ابتدا کارت‌های این ستون را به ستون دیگری منتقل کنید',
);
}
const remaining = board.stages.filter((s) => s.id !== stage.id);
await this.prisma.$transaction([
this.prisma.projectBoardStage.delete({ where: { id: stage.id } }),
...remaining.map((s, index) =>
this.prisma.projectBoardStage.update({
where: { id: s.id },
data: { position: index },
}),
),
]);
return this.getOwnedBoardDto(organizationId, board.id);
}
async reorderStages(
organizationId: string,
boardId: string,
stageIds: string[],
): Promise<ProjectBoardDto> {
const board = await this.getOwnedBoard(organizationId, boardId);
const currentIds = board.stages.map((s) => s.id);
const unique = new Set(stageIds);
if (
stageIds.length !== currentIds.length ||
unique.size !== currentIds.length ||
currentIds.some((id) => !unique.has(id))
) {
throw new BadRequestException('ترتیب ستون‌ها نامعتبر است');
}
await this.prisma.$transaction(
stageIds.map((id, index) =>
this.prisma.projectBoardStage.update({
where: { id },
data: { position: index },
}),
),
);
return this.getOwnedBoardDto(organizationId, board.id);
}
private async getOwnedBoard(organizationId: string, boardId: string) {
const board = await this.prisma.projectBoard.findFirst({
where: { id: boardId, organizationId },
include: { stages: { orderBy: { position: 'asc' as const } } },
});
if (!board) throw new NotFoundException('برد پیدا نشد');
return board;
}
private async getOwnedBoardDto(organizationId: string, boardId: string) {
const board = await this.getOwnedBoard(organizationId, boardId);
return this.toBoardDto(board);
}
toCardDto(row: {
id: string;
title: string;
apps/api/src/project-boards/project-cards-excel.service.ts
+12 -4
View File
@@ -108,6 +108,7 @@ export class ProjectCardsExcelService {
async import(actor: Actor, file: Express.Multer.File): Promise<ImportContactsResult> {
const rows = await readMappedRows(file, CASE_ALIASES);
const result: ImportContactsResult = { created: 0, skipped: 0, errors: [] };
const affected = new Map<string, string>();
for (let i = 0; i < rows.length; i++) {
const row = rows[i]!;
@@ -122,12 +123,13 @@ export class ProjectCardsExcelService {
}
try {
const { boardId, stageId } = await this.resolveBoardAndStage(
const { boardId, stageId, boardName } = await this.resolveBoardAndStage(
actor.organizationId,
row.boardName,
row.stageName,
isClosedStatus(row.status),
);
affected.set(boardId, boardName);
const duplicate = await this.prisma.projectCard.findFirst({
where: { organizationId: actor.organizationId, boardId, title },
select: { id: true },
@@ -165,6 +167,12 @@ export class ProjectCardsExcelService {
}
}
const entries = [...affected.entries()];
if (entries[0]) {
result.boardId = entries[0][0];
result.boards = entries.map(([, n]) => n);
}
return result;
}
@@ -204,19 +212,19 @@ export class ProjectCardsExcelService {
const existing = board.stages.find(
(s) => s.name.trim().toLowerCase() === wanted.toLowerCase(),
);
if (existing) return { boardId: board.id, stageId: existing.id };
if (existing) return { boardId: board.id, stageId: existing.id, boardName: board.name };
const maxPos = board.stages.reduce((m, s) => Math.max(m, s.position), -1);
const stage = await this.prisma.projectBoardStage.create({
data: { boardId: board.id, name: wanted, position: maxPos + 1 },
});
return { boardId: board.id, stageId: stage.id };
return { boardId: board.id, stageId: stage.id, boardName: board.name };
}
const stage = closed
? board.stages[board.stages.length - 1]
: board.stages[0];
if (!stage) throw new Error('برد مرحله‌ای ندارد');
return { boardId: board.id, stageId: stage.id };
return { boardId: board.id, stageId: stage.id, boardName: board.name };
}
private async findPersonId(organizationId: string, row: Record<string, string>) {
apps/web/src/components/pipeline/AddDealButton.vue
+9 -5
View File
@@ -4,9 +4,13 @@ import UiIcon from '@/components/UiIcon.vue';
import type { PipelineAccent } from '@/lib/pipeline-board';
import { PIPELINE_ACCENT } from '@/lib/pipeline-board';
defineProps<{
accent: PipelineAccent;
}>();
withDefaults(
defineProps<{
accent: PipelineAccent;
label?: string;
}>(),
{ label: 'افزودن معامله' },
);
const emit = defineEmits<{
add: [];
@@ -19,10 +23,10 @@ const emit = defineEmits<{
block
class="add-deal"
:style="{ color: PIPELINE_ACCENT[accent].text }"
aria-label="افزودن معامله"
:aria-label="label"
@click="emit('add')"
>
<UiIcon name="plus" :size="16" />
افزودن معامله
{{ label }}
</UiButton>
</template>
apps/web/src/components/pipeline/DealCard.vue
+26 -11
View File
@@ -1,14 +1,22 @@
<script setup lang="ts">
import { computed } from 'vue';
import UiIcon from '@/components/UiIcon.vue';
import type { PipelineAccent, PipelineDeal } from '@/lib/pipeline-board';
import { formatCurrencyParts, PIPELINE_ACCENT } from '@/lib/pipeline-board';
import type { PipelineAccent, PipelineDeal, PipelineUiCopy } from '@/lib/pipeline-board';
import {
DEAL_BOARD_COPY,
formatCurrencyParts,
PIPELINE_ACCENT,
} from '@/lib/pipeline-board';
const props = defineProps<{
deal: PipelineDeal;
accent: PipelineAccent;
dragging?: boolean;
}>();
const props = withDefaults(
defineProps<{
deal: PipelineDeal;
accent: PipelineAccent;
dragging?: boolean;
copy?: PipelineUiCopy;
}>(),
{ copy: () => DEAL_BOARD_COPY },
);
const emit = defineEmits<{
dragStart: [deal: PipelineDeal, event: DragEvent];
@@ -17,8 +25,11 @@ const emit = defineEmits<{
menu: [dealId: string];
}>();
const showAmount = computed(
() => !props.copy.hideAmount && props.deal.amount != null,
);
const money = computed(() =>
formatCurrencyParts(props.deal.amount, props.deal.currencyUnit ?? 'تومان'),
formatCurrencyParts(props.deal.amount ?? 0, props.deal.currencyUnit ?? 'تومان'),
);
const colors = computed(() => PIPELINE_ACCENT[props.accent]);
</script>
@@ -26,7 +37,7 @@ const colors = computed(() => PIPELINE_ACCENT[props.accent]);
<template>
<article
class="deal-card"
:class="{ dragging }"
:class="{ dragging, 'no-amount': !showAmount }"
draggable="true"
role="listitem"
:aria-grabbed="dragging ? 'true' : 'false'"
@@ -46,7 +57,7 @@ const colors = computed(() => PIPELINE_ACCENT[props.accent]);
<button
type="button"
class="menu"
aria-label="گزینه‌های معامله"
:aria-label="copy.itemMenuAria"
@click.stop="emit('menu', deal.id)"
>
<UiIcon name="dots-v" :size="16" />
@@ -62,7 +73,7 @@ const colors = computed(() => PIPELINE_ACCENT[props.accent]);
{{ deal.date }}
<UiIcon name="calendar" :size="13" />
</span>
<div class="amount">
<div v-if="showAmount" class="amount">
<strong>{{ money.number }}</strong>
<span>{{ money.unit }}</span>
</div>
@@ -111,6 +122,10 @@ const colors = computed(() => PIPELINE_ACCENT[props.accent]);
border-color: color-mix(in srgb, var(--accent) 40%, var(--line));
}
.deal-card.no-amount .date {
grid-column: 2 / -1;
}
.deal-card:focus-visible {
outline: 2px solid var(--accent);
outline-offset: 2px;
apps/web/src/components/pipeline/DealCardOverlay.vue
+13 -8
View File
@@ -1,13 +1,18 @@
<script setup lang="ts">
import DealCard from './DealCard.vue';
import type { PipelineAccent, PipelineDeal } from '@/lib/pipeline-board';
import type { PipelineAccent, PipelineDeal, PipelineUiCopy } from '@/lib/pipeline-board';
import { DEAL_BOARD_COPY } from '@/lib/pipeline-board';
defineProps<{
deal: PipelineDeal;
accent: PipelineAccent;
x: number;
y: number;
}>();
withDefaults(
defineProps<{
deal: PipelineDeal;
accent: PipelineAccent;
x: number;
y: number;
copy?: PipelineUiCopy;
}>(),
{ copy: () => DEAL_BOARD_COPY },
);
</script>
<template>
@@ -16,7 +21,7 @@ defineProps<{
:style="{ transform: `translate3d(${x}px, ${y}px, 0)` }"
aria-hidden="true"
>
<DealCard :deal="deal" :accent="accent" dragging />
<DealCard :deal="deal" :accent="accent" :copy="copy" dragging />
</div>
</template>
apps/web/src/components/pipeline/PipelineBoard.vue
+13 -7
View File
@@ -2,14 +2,19 @@
import { nextTick, ref } from 'vue';
import UiIcon from '@/components/UiIcon.vue';
import PipelineColumn from './PipelineColumn.vue';
import type { PipelineDeal, PipelineStage } from '@/lib/pipeline-board';
import type { PipelineDeal, PipelineStage, PipelineUiCopy } from '@/lib/pipeline-board';
import { DEAL_BOARD_COPY } from '@/lib/pipeline-board';
defineProps<{
stages: PipelineStage[];
draggingId: string | null;
dropStageId: string | null;
canManage?: boolean;
}>();
withDefaults(
defineProps<{
stages: PipelineStage[];
draggingId: string | null;
dropStageId: string | null;
canManage?: boolean;
copy?: PipelineUiCopy;
}>(),
{ copy: () => DEAL_BOARD_COPY },
);
const emit = defineEmits<{
dragStart: [deal: PipelineDeal, event: DragEvent];
@@ -62,6 +67,7 @@ function submitAdd() {
:dragging-id="draggingId"
:drop-active="dropStageId === stage.id"
:can-manage="canManage"
:copy="copy"
:is-first="index === 0"
:is-last="index === stages.length - 1"
@drag-start="(d, e) => emit('dragStart', d, e)"
apps/web/src/components/pipeline/PipelineColumn.vue
+19 -14
View File
@@ -3,17 +3,21 @@ import { nextTick, onBeforeUnmount, ref, watch } from 'vue';
import UiIcon from '@/components/UiIcon.vue';
import AddDealButton from './AddDealButton.vue';
import DealCard from './DealCard.vue';
import type { PipelineDeal, PipelineStage } from '@/lib/pipeline-board';
import { PIPELINE_ACCENT, toFaDealCount } from '@/lib/pipeline-board';
import type { PipelineDeal, PipelineStage, PipelineUiCopy } from '@/lib/pipeline-board';
import { DEAL_BOARD_COPY, PIPELINE_ACCENT, toFaItemCount } from '@/lib/pipeline-board';
const props = defineProps<{
stage: PipelineStage;
draggingId: string | null;
dropActive: boolean;
canManage?: boolean;
isFirst?: boolean;
isLast?: boolean;
}>();
const props = withDefaults(
defineProps<{
stage: PipelineStage;
draggingId: string | null;
dropActive: boolean;
canManage?: boolean;
isFirst?: boolean;
isLast?: boolean;
copy?: PipelineUiCopy;
}>(),
{ copy: () => DEAL_BOARD_COPY },
);
const emit = defineEmits<{
dragStart: [deal: PipelineDeal, event: DragEvent];
@@ -150,7 +154,7 @@ onBeforeUnmount(() => {
{{ stage.title }}
</h2>
</div>
<span class="count">{{ toFaDealCount(stage.deals.length) }}</span>
<span class="count">{{ toFaItemCount(stage.deals.length, copy.itemNoun) }}</span>
<div v-if="canManage" ref="menuRoot" class="more-wrap">
<button
type="button"
@@ -194,7 +198,7 @@ onBeforeUnmount(() => {
<button
type="button"
class="plus"
aria-label="افزودن معامله به این مرحله"
:aria-label="copy.addItemAria"
@click="emit('addDeal', stage.id)"
>
<UiIcon name="plus" :size="16" />
@@ -213,16 +217,17 @@ onBeforeUnmount(() => {
:deal="deal"
:accent="stage.color"
:dragging="draggingId === deal.id"
:copy="copy"
@drag-start="(d, e) => emit('dragStart', d, e)"
@drag-end="emit('dragEnd')"
@open="emit('openDeal', $event)"
@menu="emit('menuDeal', $event)"
/>
</div>
<p v-if="!stage.deals.length" class="empty">معامله‌ای نیست</p>
<p v-if="!stage.deals.length" class="empty">{{ copy.empty }}</p>
</div>
<AddDealButton :accent="stage.color" @add="emit('addDeal', stage.id)" />
<AddDealButton :accent="stage.color" :label="copy.addItem" @add="emit('addDeal', stage.id)" />
</section>
</template>
apps/web/src/components/pipeline/PipelineList.vue
+18 -11
View File
@@ -1,15 +1,20 @@
<script setup lang="ts">
import { computed } from 'vue';
import UiIcon from '@/components/UiIcon.vue';
import type { PipelineDeal, PipelineStage } from '@/lib/pipeline-board';
import type { PipelineDeal, PipelineStage, PipelineUiCopy } from '@/lib/pipeline-board';
import {
DEAL_BOARD_COPY,
formatCurrencyParts,
PIPELINE_ACCENT,
} from '@/lib/pipeline-board';
const props = defineProps<{
stages: PipelineStage[];
}>();
const props = withDefaults(
defineProps<{
stages: PipelineStage[];
copy?: PipelineUiCopy;
}>(),
{ copy: () => DEAL_BOARD_COPY },
);
const emit = defineEmits<{
openDeal: [dealId: string];
@@ -27,21 +32,23 @@ const rows = computed(() =>
);
function money(deal: PipelineDeal) {
return formatCurrencyParts(deal.amount, deal.currencyUnit ?? 'تومان');
return formatCurrencyParts(deal.amount ?? 0, deal.currencyUnit ?? 'تومان');
}
const hideAmount = computed(() => Boolean(props.copy.hideAmount));
</script>
<template>
<div class="list" dir="rtl">
<p v-if="!rows.length" class="empty">معامله‌ای نیست</p>
<p v-if="!rows.length" class="empty">{{ copy.empty }}</p>
<div v-else class="table-wrap">
<table class="data-table">
<thead>
<tr>
<th>معامله</th>
<th>{{ copy.listColTitle }}</th>
<th>مرحله</th>
<th>مبلغ</th>
<th v-if="!hideAmount">مبلغ</th>
<th>تاریخ</th>
<th></th>
</tr>
@@ -79,7 +86,7 @@ function money(deal: PipelineDeal) {
{{ row.stageTitle }}
</span>
</td>
<td>
<td v-if="!hideAmount">
<span class="amount" dir="ltr">
<strong>{{ money(row.deal).number }}</strong>
<small>{{ money(row.deal).unit }}</small>
@@ -95,7 +102,7 @@ function money(deal: PipelineDeal) {
<button
type="button"
class="menu"
aria-label="گزینه‌های معامله"
:aria-label="copy.itemMenuAria"
@click="emit('menuDeal', row.deal.id)"
>
<UiIcon name="dots-v" :size="18" />
@@ -145,7 +152,7 @@ function money(deal: PipelineDeal) {
<UiIcon name="calendar" :size="14" />
{{ row.deal.date }}
</span>
<span class="amount" dir="ltr">
<span v-if="!hideAmount" class="amount" dir="ltr">
<strong>{{ money(row.deal).number }}</strong>
<small>{{ money(row.deal).unit }}</small>
</span>
apps/web/src/components/pipeline/PipelineToolbar.vue
+51 -13
View File
@@ -11,8 +11,16 @@ withDefaults(
pipelineName: string;
pipelineOptions: Array<{ id: string; name: string }>;
canCreate?: boolean;
icon?: 'briefcase' | 'grid';
createOptionLabel?: string;
showAmountFilters?: boolean;
}>(),
{ canCreate: false },
{
canCreate: false,
icon: 'briefcase',
createOptionLabel: 'کاریز جدید…',
showAmountFilters: true,
},
);
const emit = defineEmits<{
@@ -43,7 +51,7 @@ function onPick(value: string) {
<header class="toolbar" dir="rtl">
<div class="title-block">
<span class="brand-ico" aria-hidden="true">
<UiIcon name="briefcase" :size="18" />
<UiIcon :name="icon" :size="18" />
</span>
<h1>{{ pipelineName }}</h1>
</div>
@@ -54,7 +62,7 @@ function onPick(value: string) {
</template>
</UiSegmented>
<UiSelect
<UiSelect
class="pipeline-pick"
:model-value="selectedPipelineId"
@update:model-value="onPick"
@@ -66,18 +74,28 @@ function onPick(value: string) {
>
{{ opt.name }}
</option>
<option v-if="canCreate" value="__create__">کاریز جدید…</option>
<option v-if="canCreate" value="__create__">{{ createOptionLabel }}</option>
</UiSelect>
<UiFilterBar v-model:search="search" class="filters">
<label class="field">
<span>حداقل مبلغ</span>
<input v-model="amountMin" type="number" min="0" placeholder="۰" />
</label>
<label class="field">
<span>حداکثر مبلغ</span>
<input v-model="amountMax" type="number" min="0" placeholder="—" />
</label>
<div class="excel-actions">
<slot name="excel" />
</div>
<UiFilterBar
v-model:search="search"
class="filters"
:show-filters="showAmountFilters"
>
<template v-if="showAmountFilters">
<label class="field">
<span>حداقل مبلغ</span>
<input v-model="amountMin" type="number" min="0" placeholder="۰" />
</label>
<label class="field">
<span>حداکثر مبلغ</span>
<input v-model="amountMax" type="number" min="0" placeholder="—" />
</label>
</template>
</UiFilterBar>
</header>
</template>
@@ -127,6 +145,25 @@ h1 {
min-width: 8.5rem;
}
.excel-actions {
display: flex;
flex-wrap: wrap;
gap: 0.4rem;
flex: 0 0 auto;
}
.excel-actions :deep(.btn-ghost-sm) {
border: 1px solid #e2e8f0;
background: #fff;
color: #0f766e;
border-radius: 10px;
padding: 0.45rem 0.75rem;
font-weight: 700;
font-size: 0.85rem;
cursor: pointer;
font: inherit;
}
.filters {
flex: 1 1 12rem;
min-width: 0;
@@ -153,6 +190,7 @@ h1 {
}
.pipeline-pick,
.excel-actions,
.filters {
flex: 1 1 100%;
}
apps/web/src/components/ui/UiFilterBar.vue
+3 -2
View File
@@ -7,8 +7,9 @@ import UiIcon from '@/components/UiIcon.vue';
withDefaults(
defineProps<{
placeholder?: string;
showFilters?: boolean;
}>(),
{ placeholder: 'جستجو...' },
{ placeholder: 'جستجو...', showFilters: true },
);
const search = defineModel<string>('search', { default: '' });
@@ -20,7 +21,7 @@ const open = ref(false);
<div class="row">
<slot name="before" />
<UiSearch v-model="search" :placeholder="placeholder" class="search" />
<UiButton type="button" @click="open = !open">
<UiButton v-if="showFilters" type="button" @click="open = !open">
<UiIcon name="filter" :size="16" />
فیلترها
</UiButton>
apps/web/src/lib/pipeline-board.ts
+83 -4
View File
@@ -4,7 +4,7 @@ export type PipelineDeal = {
id: string;
title: string;
description: string;
amount: number;
amount: number | null;
date: string;
initials: string;
/** شناسه مرحله فعلی — هنگام جابه‌جایی به‌روز می‌شود */
@@ -12,6 +12,35 @@ export type PipelineDeal = {
currencyUnit?: string;
};
export type PipelineUiCopy = {
itemNoun: string;
addItem: string;
empty: string;
addItemAria: string;
itemMenuAria: string;
listColTitle: string;
hideAmount?: boolean;
};
export const DEAL_BOARD_COPY: PipelineUiCopy = {
itemNoun: 'معامله',
addItem: 'افزودن معامله',
empty: 'معامله‌ای نیست',
addItemAria: 'افزودن معامله به این مرحله',
itemMenuAria: 'گزینه‌های معامله',
listColTitle: 'معامله',
};
export const PROJECT_BOARD_COPY: PipelineUiCopy = {
itemNoun: 'کارت',
addItem: 'افزودن کارت',
empty: 'کارتی نیست',
addItemAria: 'افزودن کارت به این مرحله',
itemMenuAria: 'گزینه‌های کارت',
listColTitle: 'کارت',
hideAmount: true,
};
export type PipelineStage = {
id: string;
title: string;
@@ -152,6 +181,48 @@ export function mapBoardToStages(
});
}
export function mapProjectBoardToStages(
board: {
stages: Array<{
id: string;
name: string;
cards: Array<{
id: string;
title: string;
notes: string | null;
stageId: string;
createdAt: string;
person: { fullName: string } | null;
company: { name: string } | null;
deal: { title: string } | null;
}>;
}>;
},
formatDate: (iso: string) => string,
): PipelineStage[] {
return board.stages.map((stage, index) => ({
id: stage.id,
title: stage.name,
color: ACCENT_CYCLE[index % ACCENT_CYCLE.length]!,
deals: stage.cards.map((card) => ({
id: card.id,
title: card.title,
description:
card.company?.name ||
card.person?.fullName ||
card.deal?.title ||
card.notes?.trim() ||
'',
amount: null,
date: formatDate(card.createdAt),
initials: initialsFromTitle(
card.company?.name || card.person?.fullName || card.title,
),
stageId: card.stageId,
})),
}));
}
/**
* جابه‌جایی معامله بین مراحل یا تغییر ترتیب داخل یک مرحله.
@@ -241,15 +312,23 @@ export function filterStages(
) {
return false;
}
if (min != null && !Number.isNaN(min) && d.amount < min) return false;
if (max != null && !Number.isNaN(max) && d.amount > max) return false;
if (min != null && !Number.isNaN(min) && (d.amount == null || d.amount < min)) {
return false;
}
if (max != null && !Number.isNaN(max) && (d.amount == null || d.amount > max)) {
return false;
}
return true;
}),
}));
}
export function toFaItemCount(n: number, noun = 'معامله'): string {
return `${new Intl.NumberFormat('fa-IR').format(n)} ${noun}`;
}
export function toFaDealCount(n: number): string {
return `${new Intl.NumberFormat('fa-IR').format(n)} معامله`;
return toFaItemCount(n, 'معامله');
}
/** جابه‌جایی یک ستون به ایندکس جدید */
apps/web/src/views/PipelineBoardView.vue
+86 -2
View File
@@ -20,7 +20,8 @@ import UiButton from '@/components/ui/UiButton.vue';
import UiInput from '@/components/ui/UiInput.vue';
import UiModal from '@/components/ui/UiModal.vue';
import DealFormView from '@/views/DealFormView.vue';
import type { PipelineBoardDto, PipelineDto } from '@mento/shared';
import type { ImportContactsResult, PipelineBoardDto, PipelineDto } from '@mento/shared';
import { brand } from '@mento/shared';
import { useAuthStore } from '@/stores/auth';
import { canManageSettings } from '@/lib/roles';
@@ -44,6 +45,9 @@ const newName = ref('');
const dealModal = ref<{ dealId?: string; stageId?: string } | null>(null);
const deleteStageId = ref<string | null>(null);
const stageBusy = ref(false);
const busy = ref(false);
const importMsg = ref('');
const fileInput = ref<HTMLInputElement | null>(null);
const draggingId = ref<string | null>(null);
const draggingColumnId = ref<string | null>(null);
@@ -367,6 +371,64 @@ function onOpenDeal(dealId: string) {
void router.push({ name: 'deal-detail', params: { id: dealId } });
}
async function exportExcel() {
busy.value = true;
importMsg.value = '';
error.value = '';
try {
const { data } = await api.get<Blob>('/deals/export', { responseType: 'blob' });
const url = URL.createObjectURL(data);
const a = document.createElement('a');
a.href = url;
a.download = `${brand.filePrefix}-deals.xlsx`;
a.click();
URL.revokeObjectURL(url);
} catch {
error.value = 'خروجی اکسل ناموفق بود.';
} finally {
busy.value = false;
}
}
function pickImportFile() {
fileInput.value?.click();
}
async function onImportFile(ev: Event) {
const input = ev.target as HTMLInputElement;
const file = input.files?.[0];
input.value = '';
if (!file) return;
busy.value = true;
importMsg.value = '';
error.value = '';
try {
const form = new FormData();
form.append('file', file);
const { data } = await api.post<ImportContactsResult>('/deals/import', form, {
headers: { 'Content-Type': undefined },
});
importMsg.value = `وارد شد: ${data.created} · تکراری رد شد: ${data.skipped}${
data.errors.length ? ` · خطا: ${data.errors.length}` : ''
}${data.boards?.length ? ` · کاریز: ${data.boards.join('، ')}` : ''}`;
if (data.errors.length) {
error.value = data.errors
.slice(0, 3)
.map((e) => `ردیف ${e.row}: ${e.message}`)
.join(' | ');
}
if (data.boardId && data.boardId !== selectedPipelineId.value) {
await router.replace({ name: 'pipeline', query: { pipelineId: data.boardId } });
} else {
await load();
}
} catch (e) {
error.value = apiMessage(e, 'ایمپورت ناموفق بود');
} finally {
busy.value = false;
}
}
function onMenuDeal(dealId: string) {
menuOpenId.value = menuOpenId.value === dealId ? null : dealId;
}
@@ -405,9 +467,26 @@ defineExpose({ updateDealStage: applyUpdateDealStage });
v-model:amount-max="amountMax"
:can-create="canCreatePipeline"
@create="showCreate = true"
/>
>
<template #excel>
<button class="btn-ghost-sm" type="button" :disabled="loading || busy" @click="exportExcel">
خروجی اکسل
</button>
<button class="btn-ghost-sm" type="button" :disabled="loading || busy" @click="pickImportFile">
ورود از اکسل
</button>
<input
ref="fileInput"
type="file"
accept=".xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
hidden
@change="onImportFile"
/>
</template>
</PipelineToolbar>
<p v-if="error" class="error">{{ error }}</p>
<p v-if="importMsg" class="ok">{{ importMsg }}</p>
<p v-else-if="loading && !stages.length" class="muted">در حال بارگذاری کاریز…</p>
<PipelineList
@@ -565,6 +644,11 @@ defineExpose({ updateDealStage: applyUpdateDealStage });
font-weight: 600;
}
.ok {
color: #0f766e;
font-weight: 600;
}
.delete-copy {
margin: 0;
line-height: 1.7;
apps/web/src/views/ProductsSettingsView.vue
+87 -1
View File
@@ -9,7 +9,8 @@ import UiButton from '@/components/ui/UiButton.vue';
import UiModal from '@/components/ui/UiModal.vue';
import UiIcon from '@/components/UiIcon.vue';
import ProductFormView from '@/views/ProductFormView.vue';
import type { ProductDto } from '@mento/shared';
import type { ImportContactsResult, ProductDto } from '@mento/shared';
import { brand } from '@mento/shared';
type SortKey = 'name' | 'newest' | 'price';
type StatusFilter = 'all' | 'active' | 'inactive';
@@ -30,6 +31,9 @@ const menuId = ref<string | null>(null);
const sortOpen = ref(false);
const moreOpen = ref(false);
const productModal = ref(false);
const busy = ref(false);
const importMsg = ref('');
const fileInput = ref<HTMLInputElement | null>(null);
const categories = computed(() => {
const set = new Set<string>();
@@ -161,6 +165,70 @@ async function load() {
}
}
async function exportExcel() {
closeMenus();
busy.value = true;
importMsg.value = '';
error.value = '';
try {
const { data } = await api.get<Blob>('/products/export', {
params: { q: q.value || undefined },
responseType: 'blob',
});
const url = URL.createObjectURL(data);
const a = document.createElement('a');
a.href = url;
a.download = `${brand.filePrefix}-products.xlsx`;
a.click();
URL.revokeObjectURL(url);
} catch {
error.value = 'خروجی اکسل ناموفق بود.';
} finally {
busy.value = false;
}
}
function pickImportFile() {
closeMenus();
fileInput.value?.click();
}
async function onImportFile(ev: Event) {
const input = ev.target as HTMLInputElement;
const file = input.files?.[0];
input.value = '';
if (!file) return;
busy.value = true;
importMsg.value = '';
error.value = '';
try {
const form = new FormData();
form.append('file', file);
const { data } = await api.post<ImportContactsResult>('/products/import', form, {
headers: { 'Content-Type': undefined },
});
importMsg.value = `وارد شد: ${data.created} · تکراری رد شد: ${data.skipped}${
data.errors.length ? ` · خطا: ${data.errors.length}` : ''
}`;
if (data.errors.length) {
error.value = data.errors
.slice(0, 3)
.map((e) => `ردیف ${e.row}: ${e.message}`)
.join(' | ');
}
await load();
} catch (e) {
error.value = axios.isAxiosError(e)
? String(
(e.response?.data as { message?: string | string[] })?.message ??
'ایمپورت ناموفق بود',
)
: 'ایمپورت ناموفق بود';
} finally {
busy.value = false;
}
}
async function toggleActive(product: ProductDto) {
closeMenus();
await api.patch(`/products/${product.id}`, { isActive: !product.isActive });
@@ -208,6 +276,19 @@ onMounted(load);
</div>
</div>
<div class="head-actions" @click.stop>
<button class="ghost-btn" type="button" :disabled="busy" @click="exportExcel">
خروجی اکسل
</button>
<button class="ghost-btn" type="button" :disabled="busy" @click="pickImportFile">
ورود از اکسل
</button>
<input
ref="fileInput"
type="file"
accept=".xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
hidden
@change="onImportFile"
/>
<UiButton type="button" @click="productModal = true">
<UiIcon name="plus" :size="16" />
محصول جدید
@@ -269,6 +350,7 @@ onMounted(load);
</div>
<p v-if="error" class="error">{{ error }}</p>
<p v-if="importMsg" class="ok">{{ importMsg }}</p>
<p v-if="loading" class="muted">در حال بارگذاری…</p>
<template v-else>
@@ -789,6 +871,10 @@ tr:last-child td {
.error {
color: #b91c1c;
}
.ok {
color: #0f766e;
font-weight: 600;
}
.fab {
display: none;
position: fixed;
apps/web/src/views/ProjectBoardView.vue
+476 -459
View File
File diff suppressed because it is too large Load Diff
apps/web/src/views/ProjectCardFormView.vue
+74 -15
View File
@@ -6,9 +6,28 @@ import { api } from '@/lib/api';
import type { ProjectCardDto } from '@mento/shared';
import UiIcon from '@/components/UiIcon.vue';
const props = withDefaults(
defineProps<{
embedded?: boolean;
cardId?: string;
initialBoardId?: string;
initialStageId?: string;
}>(),
{ embedded: false },
);
const emit = defineEmits<{
saved: [];
cancel: [];
}>();
const route = useRoute();
const router = useRouter();
const isNew = computed(() => route.name === 'project-card-new');
const id = computed(() => {
if (props.embedded) return props.cardId ?? '';
return String(route.params.id || '');
});
const isNew = computed(() => (props.embedded ? !props.cardId : route.name === 'project-card-new'));
const pageTitle = computed(() => (isNew.value ? 'کارت جدید' : 'ویرایش کارت'));
const loading = ref(false);
@@ -16,17 +35,15 @@ const saving = ref(false);
const error = ref('');
const title = ref('');
const notes = ref('');
const cardId = ref('');
async function load() {
if (isNew.value) return;
const id = String(route.params.id || '');
if (!id) return;
const cardId = id.value;
if (!cardId) return;
loading.value = true;
error.value = '';
try {
const { data } = await api.get<ProjectCardDto>(`/project-cards/${id}`);
cardId.value = data.id;
const { data } = await api.get<ProjectCardDto>(`/project-cards/${cardId}`);
title.value = data.title;
notes.value = data.notes ?? '';
} catch (e) {
@@ -46,21 +63,33 @@ async function save() {
error.value = '';
try {
if (isNew.value) {
const boardId =
typeof route.query.boardId === 'string' ? route.query.boardId : undefined;
const boardId = props.embedded
? props.initialBoardId
: typeof route.query.boardId === 'string'
? route.query.boardId
: undefined;
const { data } = await api.post<ProjectCardDto>('/project-cards', {
title: title.value.trim(),
notes: notes.value.trim() || undefined,
boardId,
stageId: props.embedded ? props.initialStageId : undefined,
personId:
typeof route.query.personId === 'string' ? route.query.personId : undefined,
});
if (props.embedded) {
emit('saved');
return;
}
await router.replace({ name: 'project-card-detail', params: { id: data.id } });
} else {
await api.patch(`/project-cards/${cardId.value}`, {
await api.patch(`/project-cards/${id.value}`, {
title: title.value.trim(),
notes: notes.value.trim() || null,
});
if (props.embedded) {
emit('saved');
return;
}
}
} catch {
error.value = 'ذخیره کارت ناموفق بود.';
@@ -70,10 +99,14 @@ async function save() {
}
async function removeCard() {
if (isNew.value || !cardId.value) return;
if (isNew.value || !id.value) return;
if (!confirm('کارت حذف شود؟')) return;
try {
await api.delete(`/project-cards/${cardId.value}`);
await api.delete(`/project-cards/${id.value}`);
if (props.embedded) {
emit('saved');
return;
}
await router.push({ name: 'projects' });
} catch {
error.value = 'حذف کارت ناموفق بود.';
@@ -81,6 +114,10 @@ async function removeCard() {
}
function cancel() {
if (props.embedded) {
emit('cancel');
return;
}
void router.push({ name: 'projects' });
}
@@ -88,8 +125,20 @@ onMounted(load);
</script>
<template>
<section class="page">
<header class="desktop-head">
<section class="page" :class="{ embedded }">
<div v-if="embedded" class="embed-actions">
<button
class="btn primary"
type="button"
:disabled="saving || title.trim().length < 2"
@click="save"
>
{{ saving ? 'در حال ذخیره…' : 'ذخیره' }}
</button>
<button class="btn cancel" type="button" @click="cancel">انصراف</button>
<button v-if="!isNew" class="btn danger" type="button" @click="removeCard">حذف</button>
</div>
<header v-if="!embedded" class="desktop-head">
<div class="title-block">
<span class="doc-ico"><UiIcon name="document" :size="22" /></span>
<div>
@@ -115,7 +164,7 @@ onMounted(load);
</div>
</header>
<header class="mobile-head">
<header v-if="!embedded" class="mobile-head">
<button
class="icon-btn"
type="button"
@@ -143,7 +192,7 @@ onMounted(load);
<label for="card-notes">یادداشت</label>
<textarea id="card-notes" v-model="notes" rows="5" maxlength="4000" />
</div>
<div class="mobile-actions">
<div v-if="!embedded" class="mobile-actions">
<button class="btn primary" type="submit" :disabled="saving || title.trim().length < 2">
{{ saving ? 'در حال ذخیره…' : 'ذخیره' }}
</button>
@@ -162,6 +211,16 @@ onMounted(load);
width: 100%;
}
.page.embedded {
max-width: none;
}
.embed-actions {
display: flex;
flex-wrap: wrap;
gap: 0.5rem;
}
.desktop-head {
display: none;
justify-content: space-between;
packages/shared/src/index.ts
+2
View File
@@ -805,6 +805,8 @@ export interface ImportContactsResult {
created: number;
skipped: number;
errors: Array<{ row: number; message: string }>;
boardId?: string;
boards?: string[];
}
export interface ProductDto {