From d451cc438a2c05efa97b28e451c877b1da6888ff Mon Sep 17 00:00:00 2001
From: Saeed Abadiyan <sd.eed1381@gmail.com>
Date: Mon, 6 Oct 2025 06:51:09 +0330
Subject: [PATCH 1/3] hotfix: in product-innovation

---
 .../project-management/product-innovation-page.tsx   | 12 ++++++------
 app/components/ui/metric-card.tsx                    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/components/dashboard/project-management/product-innovation-page.tsx b/app/components/dashboard/project-management/product-innovation-page.tsx
index bef1a1f..a03d974 100644
--- a/app/components/dashboard/project-management/product-innovation-page.tsx
+++ b/app/components/dashboard/project-management/product-innovation-page.tsx
@@ -237,11 +237,11 @@ export function ProductInnovationPage() {
     revenueNewProducts: {
       id: "revenueNewProducts",
       title: "سهم از درآمد برای محصولات جدید",
-      value: "0",
+      value: 0,
       description: "میلیون ریال",
       descriptionPercent: "درصد به کل درآمد",
       color: "text-[#3AEA83]",
-      percent : "0"
+      percent :0
     },
     newProductExports: {
       id: "newProductExports",
@@ -466,8 +466,8 @@ export function ProductInnovationPage() {
         ...prev,
         revenueNewProducts: {
           ...prev.revenueNewProducts,
-          value: formatNumber(normalized?.new_products_revenue_share),
-          percent: formatNumber(normalized?.new_products_revenue_share_percent),
+          value:  normalized.new_products_revenue_share,
+          percent: normalized.new_products_revenue_share_percent,
         },
         impactOnImports: {
           ...prev.impactOnImports,
@@ -716,8 +716,8 @@ export function ProductInnovationPage() {
                   <div className="col-span-2">
                     <MetricCard
                       title={stateCard.revenueNewProducts.title}
-                      value={formatNumber(stateCard.revenueNewProducts.value)}
-                      percentValue={formatNumber(stateCard.revenueNewProducts.percent)}
+                      value={stateCard.revenueNewProducts.value}
+                      percentValue={stateCard.revenueNewProducts.percent}
                       valueLabel={stateCard.revenueNewProducts.description}
                       percentLabel={stateCard.revenueNewProducts.descriptionPercent}
                     />
diff --git a/app/components/ui/metric-card.tsx b/app/components/ui/metric-card.tsx
index ae0e47e..8f44c24 100644
--- a/app/components/ui/metric-card.tsx
+++ b/app/components/ui/metric-card.tsx
@@ -45,4 +45,4 @@ export function MetricCard({
           </div>
         </BaseCard>
   );
-}
\ No newline at end of file
+}

From efb1990a5546169ce07e8202cdae1f83c350a438 Mon Sep 17 00:00:00 2001
From: mahmoodsht <106068383+mahmoodsht@users.noreply.github.com>
Date: Mon, 6 Oct 2025 10:49:00 +0330
Subject: [PATCH 2/3] =?UTF-8?q?=D8=AC=D8=B2=DB=8C=DB=8C=D8=A7=D8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/strategic-alignment-popup.tsx          | 12 ++++++------
 app/components/ecosystem/network-graph.tsx           |  9 ++++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/components/dashboard/strategic-alignment-popup.tsx b/app/components/dashboard/strategic-alignment-popup.tsx
index ad39e81..d430dc3 100644
--- a/app/components/dashboard/strategic-alignment-popup.tsx
+++ b/app/components/dashboard/strategic-alignment-popup.tsx
@@ -24,7 +24,7 @@ import { TruncatedText } from "../ui/truncatedText";
 
 interface StrategicAlignmentData {
   strategic_theme: string;
-  operational_fee_sum: number;
+  operational_fee_count: number;
   percentage?: number;
 }
 
@@ -138,7 +138,7 @@ export function StrategicAlignmentPopup({
         ProcessName: "project",
         OutputFields: [
           "strategic_theme",
-          "sum(operational_fee) as operational_fee_sum",
+          "count(operational_fee)",
         ],
         GroupBy: ["strategic_theme"],
       });
@@ -168,7 +168,7 @@ export function StrategicAlignmentPopup({
           ProcessName: "project",
           OutputFields: [
             "value_technology_and_innovation",
-            "sum(operational_fee)",
+            "count(operational_fee)",
           ],
           Conditions: [["strategic_theme", "=", item]],
           GroupBy: ["value_technology_and_innovation"],
@@ -233,13 +233,13 @@ export function StrategicAlignmentPopup({
       .map((item: any) => ({
         strategic_theme:
           item.strategic_theme || item.value_technology_and_innovation || "N/A",
-        operational_fee_sum: Math.max(0, Number(item.operational_fee_sum)),
+        operational_fee_count: Math.max(0, Number(item.operational_fee_count)),
       }))
       .filter((item: StrategicAlignmentData) => item.strategic_theme !== "");
 
     const total = processedData.reduce(
       (acc: number, item: StrategicAlignmentData) =>
-        acc + item.operational_fee_sum,
+        acc + item.operational_fee_count,
       0
     );
 
@@ -247,7 +247,7 @@ export function StrategicAlignmentPopup({
       (item: StrategicAlignmentData) => ({
         ...item,
         percentage:
-          total > 0 ? Math.round((item.operational_fee_sum / total) * 100) : 0,
+          total > 0 ? Math.round((item.operational_fee_count / total) * 100) : 0,
       })
     );
     setData(dataWithPercentage || []);
diff --git a/app/components/ecosystem/network-graph.tsx b/app/components/ecosystem/network-graph.tsx
index 15b7e44..6cf0d9e 100644
--- a/app/components/ecosystem/network-graph.tsx
+++ b/app/components/ecosystem/network-graph.tsx
@@ -305,8 +305,8 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
       .enter()
       .append("g")
       .attr("class", "node")
-      .style("cursor", "pointer");
-
+      .style("cursor", d => d.stageid === -1 ? "default" : "pointer");
+      
     const drag = d3
       .drag<SVGGElement, Node>()
       .on("start", (event, d) => {
@@ -437,9 +437,12 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
           .attr("stroke-width", 3);
       });
 
+      
     nodeGroup.on("click", async function (event, d) {
       event.stopPropagation();
-      if (d.isCenter) return;
+
+        // جلوگیری از کلیک روی مرکز و دسته‌بندی‌ها
+  if (d.isCenter || d.stageid === -1) return;
 
       if (onNodeClick && d.stageid) {
         // Open dialog immediately with basic info

From 275e49f678b6f775524f2c1a9426de4b2eb69cd6 Mon Sep 17 00:00:00 2001
From: Saeed Abadiyan <sd.eed1381@gmail.com>
Date: Wed, 8 Oct 2025 17:21:33 +0330
Subject: [PATCH 3/3] fix: the styles,and components

---
 app/components/dashboard/dashboard-home.tsx   |  4 ++--
 .../mange-ideas-tech-page.tsx                 | 21 ++++++++++---------
 .../product-innovation-page.tsx               |  2 +-
 app/components/ui/funnel-chart.tsx            | 13 ++++++------
 app/components/ui/progress.tsx                |  2 +-
 app/components/ui/tabs.tsx                    |  2 +-
 6 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/app/components/dashboard/dashboard-home.tsx b/app/components/dashboard/dashboard-home.tsx
index 2237841..a3074f2 100644
--- a/app/components/dashboard/dashboard-home.tsx
+++ b/app/components/dashboard/dashboard-home.tsx
@@ -594,8 +594,8 @@ export function DashboardHome() {
             <p className="p-6 font-persian font-semibold text-lg ">
               تحقق ارزش ها
             </p>
-            <TabsList className="bg-transparent py-2 border m-6 border-gray-600">
-              <TabsTrigger value="canvas" className="cursor-pointer">
+            <TabsList className="bg-transparent py-2 m-6 border-[1px] border-[#5F6284]">
+              <TabsTrigger  value="canvas" className="cursor-pointer">
                 شماتیک
               </TabsTrigger>
               <TabsTrigger value="charts" className=" text-white cursor-pointer font-light ">
diff --git a/app/components/dashboard/project-management/mange-ideas-tech-page.tsx b/app/components/dashboard/project-management/mange-ideas-tech-page.tsx
index e7dd9d3..e4be03d 100644
--- a/app/components/dashboard/project-management/mange-ideas-tech-page.tsx
+++ b/app/components/dashboard/project-management/mange-ideas-tech-page.tsx
@@ -932,15 +932,7 @@ export function ManageIdeasTechPage() {
 
                      {/* Infinite scroll trigger */}
                      <div ref={observerRef} className="h-auto">
-                       {loadingMore && (
-                         <div className="flex items-center justify-center py-2">
-                           <div className="flex items-center gap-2">
-                             <RefreshCw className="w-4 h-4 animate-spin text-success" />
-                             <span className="font-persian text-muted-foreground text-sm">
-                             </span>
-                           </div>
-                         </div>
-                       )}
+
                      </div>
                    </CardContent>
 
@@ -951,10 +943,19 @@ export function ManageIdeasTechPage() {
                      </div>
                    </div>
                  </Card>
+                 {loadingMore && (
+                                          <div className="flex items-center justify-center py-2">
+                                            <div className="flex items-center gap-2">
+                                              <RefreshCw className="w-4 h-4 animate-spin text-success" />
+                                              <span className="font-persian text-muted-foreground text-sm">
+                                              </span>
+                                            </div>
+                                          </div>
+                                        )}
                    </div>
                    {/* Chart Section */}
                   <BaseCard icon={TrendingUp} className="col-span-1 mt-12 row-start-2 col-start-3 row-span-1" title="نمودار ایده‌ها">
-                    <MemoizedVerticalBarChart 
+                    <MemoizedVerticalBarChart
                       chartData={chartData}
                       loadingChart={loadingChart}
                       chartConfig={chartConfig}
diff --git a/app/components/dashboard/project-management/product-innovation-page.tsx b/app/components/dashboard/project-management/product-innovation-page.tsx
index a03d974..1ec7c87 100644
--- a/app/components/dashboard/project-management/product-innovation-page.tsx
+++ b/app/components/dashboard/project-management/product-innovation-page.tsx
@@ -756,7 +756,7 @@ export function ProductInnovationPage() {
         </div>
 
         {/* Funnel Chart */}
-          <Card className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] h-full backdrop-blur-sm rounded-2xl w-full overflow-hidden">
+          <Card className=" bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] h-full 2xl:h-auto pb-8 backdrop-blur-sm rounded-2xl w-full overflow-hidden">
             <CardContent className="px-0 py-4">
               <FunnelChart
                 title="قيف فرآیند پروژه ها"
diff --git a/app/components/ui/funnel-chart.tsx b/app/components/ui/funnel-chart.tsx
index 2327755..f94ce37 100644
--- a/app/components/ui/funnel-chart.tsx
+++ b/app/components/ui/funnel-chart.tsx
@@ -13,6 +13,7 @@ interface FunnelChartProps {
   title?: string;
   className?: string;
 }
+const greenColors = ["#3C9F71","#3BC47A","#3BC47A","#3BD77E","#3AEA83"]
 
 export function FunnelChart({ data, title, className = "" }: FunnelChartProps) {
   const maxValue = Math.max(...data.map(d => d.value));
@@ -20,7 +21,7 @@ export function FunnelChart({ data, title, className = "" }: FunnelChartProps) {
     if (!maxValue || maxValue <= 0) return 0;
     return Math.round((value / maxValue) * 100);
   };
-  
+
   return (
     <div className={`w-full ${className}`}>
       {title && (
@@ -28,7 +29,7 @@ export function FunnelChart({ data, title, className = "" }: FunnelChartProps) {
           {title}
         </h3>
       )}
-      
+
       <div className="flex px-4 flex-col items-center gap-2 space-y-2">
         {/* Start Process Line */}
         <div className="flex items-center w-full gap-10 mt-6 px-4">
@@ -47,18 +48,18 @@ export function FunnelChart({ data, title, className = "" }: FunnelChartProps) {
           {data.map((item, index) => {
             const widthPercentage = toPercent(item.value);
             const barWidth = Math.max(20, widthPercentage); // Minimum 20% width
-            
+
             return (
               <div key={index} className="grid  grid-cols-[6rem_1fr]  gap-2 w-full">
-                  <div className="text-sm font-light text-white cols-start-1 justify-self-start font-thin min-w-[max-content] text-center">
+                  <div className="text-sm font-light text-white font-persian cols-start-1 justify-self-start min-w-[max-content] text-center">
                     {item.label}
                   </div>
-                <div className="flex items-center gap-10 w-full cols-start-2 flex items-center justify-center w-full">
+                <div className="flex items-center gap-10 w-full cols-start-2  justify-center">
                   <div className="flex items-center w-full">
                     <div style={{ width: `${(100 - barWidth) / 2}%` }} />
                     <div
                       className="bg-[#3BC47A] h-8  rounded-2xl flex items-center justify-center text-lg relative"
-                      style={{ width: `${barWidth}%` }}
+                      style={{ width: `${barWidth}%` ,backgroundColor : `${greenColors[index]}`}}
                     >
                       <span className="text-pr-gray text-base font-semibold">
                         {item.value.toLocaleString('fa-IR')}
diff --git a/app/components/ui/progress.tsx b/app/components/ui/progress.tsx
index 8fdf955..9a82b53 100644
--- a/app/components/ui/progress.tsx
+++ b/app/components/ui/progress.tsx
@@ -19,7 +19,7 @@ const Progress = React.forwardRef<
     <span className="w-full right-0 text-sm absolute z-10 px-2  text-[#5F6284]"
     >{formatNumber(Math.ceil(value || 0 * 10) / 10)}%</span>
     <ProgressPrimitive.Indicator
-      className="h-full w-full flex-1 bg-primary transition-all"
+      className="h-full w-full flex-1 bg-pr-green transition-all"
       style={{ transform: `translateX(-${15 - (value || 0)}%)` }}
     />
   </ProgressPrimitive.Root>
diff --git a/app/components/ui/tabs.tsx b/app/components/ui/tabs.tsx
index e9354c2..28e662a 100644
--- a/app/components/ui/tabs.tsx
+++ b/app/components/ui/tabs.tsx
@@ -81,7 +81,7 @@ export function TabsTrigger({
       className={cn(
         "inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
         isActive
-          ? "bg-gray-700 text-foreground shadow-sm"
+          ? "bg-pr-gray text-foreground shadow-sm"
           : "hover:bg-muted/50",
         className,
       )}