diff --git a/app/components/dashboard/project-management/digital-innovation-page.tsx b/app/components/dashboard/project-management/digital-innovation-page.tsx index 1a0aefb..50030a2 100644 --- a/app/components/dashboard/project-management/digital-innovation-page.tsx +++ b/app/components/dashboard/project-management/digital-innovation-page.tsx @@ -19,15 +19,7 @@ import { DialogHeader, DialogTitle, } from "~/components/ui/dialog"; -import { - ChevronUp, - ChevronDown, - RefreshCw, - Building2, - PickaxeIcon, - UserIcon, - UsersIcon, -} from "lucide-react"; +import { ChevronUp, ChevronDown, RefreshCw } from "lucide-react"; import apiService from "~/lib/api"; import toast from "react-hot-toast"; import { @@ -172,6 +164,7 @@ export function DigitalInnovationPage() { resourceProductivity: 0, resourceProductivityPercent: 0, avarageProjectScore: 0, + countInnovationDigitalProjects: 0, }); const [sortConfig, setSortConfig] = useState({ field: "start_date", @@ -476,7 +469,9 @@ export function DigitalInnovationPage() { payload?.resource_productivity_percent ), avarageProjectScore: parseNum(payload?.average_project_score), - countInnovationDigitalProjects: parseNum(payload?.count_innovation_digital_projects), + countInnovationDigitalProjects: parseNum( + payload?.count_innovation_digital_projects + ), }; setActualTotalCount(normalized.countInnovationDigitalProjects); setStats(normalized); @@ -649,7 +644,7 @@ export function DigitalInnovationPage() { Array.from({ length: 4 }).map((_, index) => (
@@ -711,11 +706,12 @@ export function DigitalInnovationPage() {
{/* Process Impacts Chart */} - + {/* */}
- کل پروژه ها : {formatNumber(actualTotalCount)} + کل پروژه ها : {formatNumber(actualTotalCount)}
diff --git a/app/components/dashboard/project-management/green-innovation-page.tsx b/app/components/dashboard/project-management/green-innovation-page.tsx index 164bd3c..027918d 100644 --- a/app/components/dashboard/project-management/green-innovation-page.tsx +++ b/app/components/dashboard/project-management/green-innovation-page.tsx @@ -103,7 +103,6 @@ interface InnovationStats { count_innovation_green_projects: number; } - interface Params { icon: any; label: string; @@ -137,7 +136,6 @@ enum projectStatus { finish = "پایان یافته", } - const columns = [ { key: "select", label: "", sortable: false, width: "50px" }, { key: "project_no", label: "شماره پروژه", sortable: true, width: "140px" }, @@ -617,19 +615,19 @@ export function GreenInnovationPage() { ); case "title": return {String(value)}; - case "project_status": - return ( -
- - {String(value)} -
- ); + case "project_status": + return ( +
+ + {String(value)} +
+ ); case "project_rating": return ( @@ -684,7 +682,7 @@ export function GreenInnovationPage() {
{/* Stats Cards */} -
+
{/* Stats Grid */} {loading || statsLoading @@ -756,7 +754,7 @@ export function GreenInnovationPage() { {/* Process Impacts Chart */} {statsLoading ? ( - +
@@ -799,7 +797,7 @@ export function GreenInnovationPage() { ) : ( - +
diff --git a/app/components/ui/custom-bar-chart.tsx b/app/components/ui/custom-bar-chart.tsx index 552f771..d74a926 100644 --- a/app/components/ui/custom-bar-chart.tsx +++ b/app/components/ui/custom-bar-chart.tsx @@ -32,7 +32,7 @@ export function CustomBarChart({ }: CustomBarChartProps) { // Calculate the maximum value across all data points for consistent scaling const globalMaxValue = Math.max( - ...data.map((item) => item.maxValue || item.value), + ...data.map((item) => item.maxValue || item.value) ); // Loading skeleton @@ -43,7 +43,7 @@ export function CustomBarChart({
)} -
+
{Array.from({ length: 4 }).map((_, index) => (
{/* Label skeleton */} @@ -86,8 +86,9 @@ export function CustomBarChart({
{/* Label */} {item.label} @@ -97,8 +98,9 @@ export function CustomBarChart({ className={`flex-1 flex items-center bg-gray-700 rounded-full relative overflow-hidden ${barHeight}`} >
{item.valuePrefix || ""} {formatNumber(parseFloat(displayValue))}