Merge remote-tracking branch 'origin/prod_v2' into integration
This commit is contained in:
MMD
@@ -11,9 +11,8 @@ import {
|
||||
} from "../../hooks";
|
||||
import { useAppStore } from "../../store";
|
||||
import { filterQuotes } from "../../lib/quoteUtils";
|
||||
import { daysBetween } from "../../lib/formatters";
|
||||
import { Header, PageLayout } from "../../components/layout/Header";
|
||||
import { StatsBar } from "../../components/StatsBar";
|
||||
import { StatsBar, type StatusFilter } from "../../components/StatsBar";
|
||||
import { FilterToolbar, type Filters } from "./FilterToolbar";
|
||||
import { LedgerTable } from "./LedgerTable";
|
||||
import { AppSwitcherMenu } from "../../components/AppSwitcherMenu";
|
||||
@@ -56,18 +55,31 @@ export function DashboardPage() {
|
||||
return [...list].sort((a, b) => (sortDir === "desc" ? createdTs(b) - createdTs(a) : createdTs(a) - createdTs(b)));
|
||||
}, [store, filters, sortDir]);
|
||||
|
||||
// شمارش تفکیکی پیشنهادها بر اساس پایپ‌لاین خرید
|
||||
const stats = useMemo(() => {
|
||||
const total = quotes.length;
|
||||
const offered = quotes.filter((q) => q.status === "offered").length;
|
||||
const accepted = quotes.filter((q) => q.status === "accepted").length;
|
||||
const leadTimes = quotes
|
||||
.filter((q) => q.status === "arrived" && q.accepted_date && q.arrived_date)
|
||||
.map((q) => daysBetween(q.arrived_date, q.accepted_date))
|
||||
.filter((x): x is number => x != null);
|
||||
const avgLead = leadTimes.length ? Math.round(leadTimes.reduce((a, b) => a + b, 0) / leadTimes.length) : null;
|
||||
return { total, offered, accepted, avgLead };
|
||||
const arrived = quotes.filter((q) => q.status === "arrived").length;
|
||||
return { total, offered, accepted, arrived };
|
||||
}, [quotes]);
|
||||
|
||||
// وضعیت فعال در StatsBar بر اساس مقدار فعلی filters.status
|
||||
const activeStatusFilter: StatusFilter = useMemo(() => {
|
||||
if (filters.status === "offered") return "offered";
|
||||
if (filters.status === "accepted") return "accepted";
|
||||
if (filters.status === "arrived") return "arrived";
|
||||
return "all";
|
||||
}, [filters.status]);
|
||||
|
||||
// تغییر فیلتر وضعیت هنگام کلیک روی هر یک از ۴ کارت
|
||||
const handleStatusFilterChange = (status: StatusFilter) => {
|
||||
setFilters((prev) => ({
|
||||
...prev,
|
||||
status: status === "all" ? "" : status,
|
||||
}));
|
||||
};
|
||||
|
||||
const categoryOptions = useMemo(() => [...new Set(materials.map((m) => m.category))], [materials]);
|
||||
const supplierOptions = useMemo(() => suppliers.map((s) => ({ id: s.id, name: s.name })), [suppliers]);
|
||||
|
||||
@@ -119,7 +131,9 @@ export function DashboardPage() {
|
||||
total={stats.total}
|
||||
offered={stats.offered}
|
||||
accepted={stats.accepted}
|
||||
avgLeadTime={stats.avgLead}
|
||||
arrived={stats.arrived}
|
||||
activeFilter={activeStatusFilter}
|
||||
onFilterChange={handleStatusFilterChange}
|
||||
/>
|
||||
<FilterToolbar
|
||||
filters={filters}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import { useState } from "react";
|
||||
import { SlidersHorizontal, X, ArrowUpDown, RotateCcw } from "lucide-react";
|
||||
import { Combobox } from "../../components/Combobox";
|
||||
import { STATUS_LABEL, STATUS_ORDER } from "../../lib/constants";
|
||||
|
||||
export interface Filters {
|
||||
category: string;
|
||||
@@ -10,8 +9,33 @@ export interface Filters {
|
||||
search: string;
|
||||
}
|
||||
|
||||
// لیست وضعیت‌ها از dictionary واحد (constants) — نه آرایه‌ی تکراری
|
||||
const STATUS_ITEMS = STATUS_ORDER.map((s) => STATUS_LABEL[s]);
|
||||
// گزینه‌های استاندارد و یکپارچه وضعیت هماهنگ با کارت‌های بالای صفحه
|
||||
const STATUS_OPTIONS = [
|
||||
{ id: "offered", label: "پیشنهاد باز" },
|
||||
{ id: "accepted", label: "پذیرفته‌شده" },
|
||||
{ id: "arrived", label: "تحویل‌شده" },
|
||||
];
|
||||
|
||||
const STATUS_MAP: Record<string, string> = {
|
||||
offered: "پیشنهاد باز",
|
||||
accepted: "پذیرفته‌شده",
|
||||
arrived: "تحویل‌شده",
|
||||
};
|
||||
|
||||
const STATUS_TO_KEY: Record<string, string> = {
|
||||
"پیشنهاد باز": "offered",
|
||||
"پذیرفته‌شده": "accepted",
|
||||
"تحویل‌شده": "arrived",
|
||||
"پیشنهاد شده": "offered",
|
||||
"پذیرفته شده": "accepted",
|
||||
"رسیده": "arrived",
|
||||
"باز": "offered",
|
||||
"پذیرفته": "accepted",
|
||||
"تحویل": "arrived",
|
||||
offered: "offered",
|
||||
accepted: "accepted",
|
||||
arrived: "arrived",
|
||||
};
|
||||
|
||||
export interface FilterToolbarProps {
|
||||
filters: Filters;
|
||||
@@ -40,6 +64,14 @@ export function FilterToolbar({
|
||||
onChange({ ...filters, category: "", supplier: "", status: "" });
|
||||
};
|
||||
|
||||
// تبدیل کلید انگلیسی به لیبل فارسی برای نمایش داخل کامبوباکس
|
||||
const statusDisplayValue = STATUS_MAP[filters.status] || filters.status;
|
||||
|
||||
const handleStatusChange = (val: string) => {
|
||||
const key = STATUS_TO_KEY[val] || val;
|
||||
set({ status: key });
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
{/* ===== نمای موبایل (صفحه‌نمایش‌های زیر md) ===== */}
|
||||
@@ -148,12 +180,12 @@ export function FilterToolbar({
|
||||
<div className="field">
|
||||
<label className="mb-1 block text-xs font-semibold text-muted">وضعیت</label>
|
||||
<Combobox
|
||||
value={filters.status}
|
||||
onChange={(it: { id: string; label: string }) => set({ status: it.label })}
|
||||
items={STATUS_ITEMS}
|
||||
value={statusDisplayValue}
|
||||
onChange={(it: { id: string; label: string }) => handleStatusChange(it.label)}
|
||||
items={STATUS_OPTIONS}
|
||||
allowAdd={false}
|
||||
placeholder="همه وضعیت‌ها"
|
||||
onInputChange={(v) => set({ status: v })}
|
||||
onInputChange={handleStatusChange}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@@ -197,12 +229,12 @@ export function FilterToolbar({
|
||||
<div className="field min-w-[150px] flex-1">
|
||||
<label>وضعیت</label>
|
||||
<Combobox
|
||||
value={filters.status}
|
||||
onChange={(it: { id: string; label: string }) => set({ status: it.label })}
|
||||
items={STATUS_ITEMS}
|
||||
value={statusDisplayValue}
|
||||
onChange={(it: { id: string; label: string }) => handleStatusChange(it.label)}
|
||||
items={STATUS_OPTIONS}
|
||||
allowAdd={false}
|
||||
placeholder="همه"
|
||||
onInputChange={(v) => set({ status: v })}
|
||||
onInputChange={handleStatusChange}
|
||||
/>
|
||||
</div>
|
||||
<div className="field min-w-[200px] flex-1">
|
||||
|
||||
@@ -7,6 +7,7 @@ import { nextId } from "../../lib/api";
|
||||
import { useAddSupplier, useMaterials, useQuotes, useRemoveSupplier, useStoreData, useSuppliers } from "../../hooks";
|
||||
import { useAppStore } from "../../store";
|
||||
import { topicByName } from "../../lib/topics";
|
||||
import { daysBetween } from "../../lib/formatters";
|
||||
import { Header, PageLayout } from "../../components/layout/Header";
|
||||
import { EmptyState } from "../../components/EmptyState";
|
||||
import { Combobox } from "../../components/Combobox";
|
||||
@@ -15,7 +16,6 @@ import { materialLabel } from "../../lib/quoteUtils";
|
||||
import { Button } from "../../components/ui/button";
|
||||
|
||||
// صفحه‌ی تأمین‌کننده‌های یک دسته + فرم افزودن تأمین‌کننده
|
||||
// (سلسله‌مراتب دامنه: دسته → تأمین‌کننده؛ در v2.6 دسته = تاپیک)
|
||||
export function CategoryPage() {
|
||||
useStoreData();
|
||||
const { category: catParam = "" } = useParams();
|
||||
@@ -36,12 +36,29 @@ export function CategoryPage() {
|
||||
contact: "",
|
||||
});
|
||||
|
||||
// همه‌ی تأمین‌کننده‌ها برای انتخاب سریع (task: کومبوکس کش‌شده)
|
||||
// همه‌ی تأمین‌کننده‌ها برای انتخاب سریع
|
||||
const supplierOptions = useMemo(
|
||||
() => suppliers.map((s) => ({ id: s.id, name: s.name })),
|
||||
[suppliers],
|
||||
);
|
||||
|
||||
// محاسبه میانگین زمان تحویل اختصاصی هر تأمین‌کننده بر اساس سفارش‌های تحویل‌شده
|
||||
const supLeadTimes = useMemo(() => {
|
||||
const map = new Map<string, number | null>();
|
||||
suppliers.forEach((s) => {
|
||||
const supQuotes = quotes.filter(
|
||||
(q) => q.supplier_id === s.id && q.status === "arrived" && q.accepted_date && q.arrived_date
|
||||
);
|
||||
const times = supQuotes
|
||||
.map((q) => daysBetween(q.arrived_date, q.accepted_date))
|
||||
.filter((x): x is number => x != null);
|
||||
|
||||
const avg = times.length ? Math.round(times.reduce((a, b) => a + b, 0) / times.length) : null;
|
||||
map.set(s.id, avg);
|
||||
});
|
||||
return map;
|
||||
}, [quotes, suppliers]);
|
||||
|
||||
if (!cat) return <Navigate to="/suppliers" replace />;
|
||||
|
||||
const sups = suppliersOfCategory(cat, cat, suppliers);
|
||||
@@ -69,7 +86,6 @@ export function CategoryPage() {
|
||||
toast.error("نام تأمین‌کننده را وارد کنید.");
|
||||
return;
|
||||
}
|
||||
// تأمین‌کننده دقیقاً زیر همین دسته ثبت می‌شود (۱ دسته به ازای هر تأمین‌کننده)
|
||||
const s: Supplier = {
|
||||
id: nextId("s", suppliers),
|
||||
topic: cat,
|
||||
@@ -101,7 +117,15 @@ export function CategoryPage() {
|
||||
) : (
|
||||
<div className="grid grid-cols-2 gap-3 sm:grid-cols-3 lg:grid-cols-4">
|
||||
{sups.map((s) => (
|
||||
<SupplierCard key={s.id} s={s} topic={cat} deletable onDelete={removeSup} materials={supMats.get(s.id) || []} />
|
||||
<SupplierCard
|
||||
key={s.id}
|
||||
s={s}
|
||||
topic={cat}
|
||||
deletable
|
||||
onDelete={removeSup}
|
||||
materials={supMats.get(s.id) || []}
|
||||
avgLeadTime={supLeadTimes.get(s.id)}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
@@ -161,4 +185,4 @@ export function CategoryPage() {
|
||||
</PageLayout>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,9 @@
|
||||
import { Link } from "react-router-dom";
|
||||
import { MapPin, Phone, User, Plus } from "lucide-react";
|
||||
import { MapPin, Phone, User, Plus, Timer } from "lucide-react";
|
||||
import type { Material, Supplier } from "../../lib/types";
|
||||
import { normalize } from "../../lib/normalize";
|
||||
import { fmtNum } from "../../lib/formatters";
|
||||
|
||||
export function topicCategories(topic: string, materials: Material[], suppliers: Supplier[]): string[] {
|
||||
const out = new Set<string>();
|
||||
materials
|
||||
@@ -19,32 +21,44 @@ export function suppliersOfCategory(topic: string, cat: string, suppliers: Suppl
|
||||
);
|
||||
}
|
||||
|
||||
// کارت تأمین‌کننده
|
||||
// کارت تأمین‌کننده همراه با برچسب میانگین زمان تحویل
|
||||
export function SupplierCard({
|
||||
s,
|
||||
topic,
|
||||
deletable,
|
||||
onDelete,
|
||||
materials = [],
|
||||
avgLeadTime,
|
||||
}: {
|
||||
s: Supplier;
|
||||
topic: string;
|
||||
deletable?: boolean;
|
||||
onDelete?: (id: string) => void;
|
||||
// متریال‌های خریداری‌شده از این تأمین‌کننده (به‌جای دسته‌بندی)
|
||||
materials?: string[];
|
||||
avgLeadTime?: number | null;
|
||||
}) {
|
||||
return (
|
||||
<div className="sup-card">
|
||||
<div className="sc-head">
|
||||
<Link to={`/suppliers/${s.id}`} className="sc-name-link">
|
||||
<div className="sc-head flex items-start justify-between gap-2">
|
||||
<Link to={`/suppliers/${s.id}`} className="sc-name-link min-w-0 flex-1 leading-snug">
|
||||
{s.name}
|
||||
</Link>
|
||||
{deletable && onDelete && (
|
||||
<button type="button" className="sup-del" title="حذف تأمین‌کننده" onClick={() => onDelete(s.id)}>
|
||||
×
|
||||
</button>
|
||||
)}
|
||||
<div className="flex items-center gap-1.5 shrink-0">
|
||||
{avgLeadTime != null && (
|
||||
<span
|
||||
className="inline-flex items-center gap-1 whitespace-nowrap rounded-md bg-emerald-100 border border-emerald-300/80 px-2 py-0.5 text-xs font-bold text-emerald-900 shadow-2xs dark:bg-emerald-950 dark:border-emerald-800 dark:text-emerald-200 tabular-nums"
|
||||
title="میانگین زمان تحویل سفارش‌ها"
|
||||
>
|
||||
<Timer className="h-3.5 w-3.5 text-emerald-700 dark:text-emerald-400" />
|
||||
<span>{fmtNum(avgLeadTime)} روز</span>
|
||||
</span>
|
||||
)}
|
||||
{deletable && onDelete && (
|
||||
<button type="button" className="sup-del" title="حذف تأمین‌کننده" onClick={() => onDelete(s.id)}>
|
||||
×
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="sc-meta">
|
||||
<span>
|
||||
|
||||
Reference in New Issue
Block a user