diff --git a/app/components/dashboard/project-management/digital-innovation-page.tsx b/app/components/dashboard/project-management/digital-innovation-page.tsx index 15a18df..b2309fb 100644 --- a/app/components/dashboard/project-management/digital-innovation-page.tsx +++ b/app/components/dashboard/project-management/digital-innovation-page.tsx @@ -73,7 +73,7 @@ interface DigitalInnovationMetrics { // Normalized interface for digital innovation stats interface DigitalInnovationStats { - // totalDigitalProjects: number; + totalDigitalProjects: number; increasedRevenue: number; increasedRevenuePercent: number; reduceCosts: number; @@ -358,7 +358,7 @@ export function DigitalInnovationPage() { useEffect(() => { fetchTable(true); - fetchTotalCount(); + // fetchTotalCount(); fetchStats(); }, [sortConfig]); @@ -440,10 +440,9 @@ export function DigitalInnovationPage() { const fetchStats = async () => { try { setStatsLoading(true); - const raw = await apiService.callInnovationProcess({ + const raw = await apiService.call({ innovation_digital_function: {}, }); - let payload: DigitalInnovationMetrics = raw?.data; if (typeof payload === "string") { try { @@ -462,6 +461,9 @@ export function DigitalInnovationPage() { return 0; }; const normalized: DigitalInnovationStats = { + totalDigitalProjects: parseNum( + payload.count_innovation_digital_projects + ), increasedRevenue: parseNum(payload?.increased_revenue), increasedRevenuePercent: parseNum(payload?.increased_revenue_percent), reduceCosts: parseNum(payload?.reduce_costs), @@ -637,10 +639,10 @@ export function DigitalInnovationPage() {
{/* Stats Cards */} -
+
{/* Stats Grid */} -
+
{loading || statsLoading ? // Loading skeleton for stats cards - matching new design Array.from({ length: 4 }).map((_, index) => ( @@ -678,19 +680,19 @@ export function DigitalInnovationPage() { key={card.id} className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] backdrop-blur-sm border-gray-700/50" > - +
-
-

+
+

{card.title}

{card.icon}
-
+

@@ -750,7 +752,7 @@ export function DigitalInnovationPage() {

- +
{columns.map((column) => ( @@ -863,31 +865,28 @@ export function DigitalInnovationPage() { {/* Footer */} -
-
-
+
+
+
- کل پروژه ها :{formatNumber(actualTotalCount)} + کل پروژه ها : + {formatNumber(stats.totalDigitalProjects)}
- {/* Project number column - empty */} -
- {/* Title column - empty */} -
- {/* Project status column - empty */} -
- - - - -
- {/* Project rating column - show average */} -
-
- میانگین امتیاز :‌ + +
+
+ + + +
-
- {formatNumber(((avarage ?? 0) as number).toFixed?.(1) ?? 0)} + +
+
میانگین :‌
+
+ {formatNumber(((avarage ?? 0) as number).toFixed?.(1) ?? 0)} +
diff --git a/app/components/ui/custom-bar-chart.tsx b/app/components/ui/custom-bar-chart.tsx index 552f771..08e6e48 100644 --- a/app/components/ui/custom-bar-chart.tsx +++ b/app/components/ui/custom-bar-chart.tsx @@ -70,7 +70,7 @@ export function CustomBarChart({
{title && ( -

+

{title}

)}