diff --git a/app/components/dashboard/project-management/green-innovation-page.tsx b/app/components/dashboard/project-management/green-innovation-page.tsx index 6601799..116a4bb 100644 --- a/app/components/dashboard/project-management/green-innovation-page.tsx +++ b/app/components/dashboard/project-management/green-innovation-page.tsx @@ -1,4 +1,4 @@ -import moment from "moment-jalaali"; +// import moment from "moment-jalaali"; import { useCallback, useEffect, useRef, useState } from "react"; import { Bar, @@ -47,7 +47,7 @@ import apiService from "~/lib/api"; import { formatCurrency } from "~/lib/utils"; import DashboardLayout from "../layout"; -moment.loadPersian({ usePersianDigits: true }); +// moment.loadPersian({ usePersianDigits: true }); interface GreenInnovationData { WorkflowID: string; approved_budget: string; diff --git a/app/components/dashboard/project-management/innovation-built-inside-page.tsx b/app/components/dashboard/project-management/innovation-built-inside-page.tsx index 4780b99..ddf6848 100644 --- a/app/components/dashboard/project-management/innovation-built-inside-page.tsx +++ b/app/components/dashboard/project-management/innovation-built-inside-page.tsx @@ -1,4 +1,3 @@ -import moment from "moment-jalaali"; import { useCallback, useEffect, useRef, useState } from "react"; import { Badge } from "~/components/ui/badge"; import { Button } from "~/components/ui/button"; @@ -43,8 +42,6 @@ import apiService from "~/lib/api"; import { formatCurrency } from "~/lib/utils"; import DashboardLayout from "../layout"; -moment.loadPersian({ usePersianDigits: true }); - interface innovationBuiltInDate { WorkflowID: number; approved_budget: string; @@ -194,9 +191,8 @@ export function InnovationBuiltInsidePage() { direction: "asc", }); const [tblAvarage, setTblAvarage] = useState(0); - const [selectedProjects, setSelectedProjects] = useState< - Set - >(new Set()); + const [selectedProjects, setSelectedProjects] = + useState>(); const [detailsDialogOpen, setDetailsDialogOpen] = useState(false); const [selectedProjectDetails, setSelectedProjectDetails] = useState(); @@ -426,7 +422,6 @@ export function InnovationBuiltInsidePage() { useEffect(() => { fetchProjects(true); - fetchStats(); }, [sortConfig]); useEffect(() => { @@ -486,7 +481,7 @@ export function InnovationBuiltInsidePage() { const raw = await apiService.call({ innovation_construction_inside_function: { project_ids: - selectedProjects.size > 0 + selectedProjects && selectedProjects?.size > 0 ? Array.from(selectedProjects).join(" , ") : "", }, @@ -622,7 +617,7 @@ export function InnovationBuiltInsidePage() { case "select": return ( handleSelectProject(item?.project_id)} className="data-[state=checked]:bg-emerald-600 data-[state=checked]:border-emerald-600 cursor-pointer" /> @@ -1039,7 +1034,7 @@ export function InnovationBuiltInsidePage() { {/* Project Details Dialog */} - + شرح پروژه @@ -1192,12 +1187,12 @@ export function InnovationBuiltInsidePage() { ) : (
-
- +
+ شاخص مقایسه با نمونه خارجی - نمونه داخلی - نمونه خارجی + نمونه داخلی + نمونه خارجی
{selectedProjectDetails?.technology_params?.map( @@ -1268,7 +1263,7 @@ export function InnovationBuiltInsidePage() {