آماده سازی برای دو پتروشیمی دیگر

Reviewed-on: https://git.pelekan.org/Saeed0920/inogen/pulls/15
Co-authored-by: Saeed Abadiyan <sd.eed1381@gmail.com>
Co-committed-by: Saeed Abadiyan <sd.eed1381@gmail.com>

FIGMA_LOGIN_IMPLEMENTATION.md

@@ -160,9 +160,9 @@ This document describes the exact implementation of the login page based on the
       onChange={(e) => setRememberMe(e.target.checked)}
       className="w-4 h-4 text-[#4FD1C7] bg-white border-gray-300 rounded focus:ring-[#4FD1C7] focus:ring-2 accent-[#4FD1C7]"
     />
-    <Label htmlFor="remember" className="text-white text-sm font-persian cursor-pointer">
+    // <Label htmlFor="remember" className="text-white text-sm font-persian cursor-pointer">
-      همیشه متصل بمانم
+    //   همیشه متصل بمانم
-    </Label>
+    // </Label>
   </div>
 
   {/* Submit Button */}

app/components/auth/login-form.tsx

@@ -176,7 +176,7 @@ export function LoginForm({ onSuccess }: LoginFormProps) {
             />
 
             {/* Remember Me Checkbox */}
-            <div className="flex justify-end">
+            {/* <div className="flex justify-end">
               <CheckboxField
                 id="remember"
                 label="همیشه متصل بمان"
@@ -185,7 +185,7 @@ export function LoginForm({ onSuccess }: LoginFormProps) {
                 disabled={isLoading}
                 size="md"
               />
-            </div>
+            </div> */}
 
             {/* Login Button */}
             <Button
@@ -212,7 +212,9 @@ export function LoginForm({ onSuccess }: LoginFormProps) {
       {/* Right Side - Branding */}
       <LoginSidebar>
         <LoginBranding
-          brandName="پتروشیمی بندر امام"
+          brandName="پتروشیمی آپادانا"
+          // brandName="پتروشیمی نوری"
+          // brandName="پتروشیمی بندر امام"
           engSub="Inception by Fara"
           companyName="توسعه‌یافته توسط شرکت رهپویان دانش و فناوری فرا"
           logo={<img src="/brand2.svg"/>}

app/components/auth/login-layout.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 import { cn } from "~/lib/utils";
 
+
 interface LoginLayoutProps {
   children: React.ReactNode;
   className?: string;
@@ -106,15 +107,26 @@ export function LoginBranding({
 }: LoginBrandingProps) {
   return (
     <>
-      {/* Top Logo */}
 <div className="flex justify-end">
   <div className="text-slate-800 font-persian">
     <div className="text-lg font-bold leading-tight">
-           <img src="/brand.svg" />
+      <img 
+        src="/brand.svg?v=1" 
+        alt="Brand Logo"
+        className="w-auto h-16" // اضافه کردن سایز مشخص
+        onError={(e) => {
+          e.target.style.display = 'none';
+          console.log('Image failed to load');
+        }}
+      />
     </div>
   </div>
 </div>
 
+
+
+
+
       {/* Bottom Section */}
       <div className="flex flex-col gap-2 mb-4 items-end justify-end">
         {logo && <div className="flex items-center">{logo}</div>}

app/components/dashboard/d3-image-info.tsx

@@ -1,3 +1,6 @@
+//این فایل مخصوص
+//شماتیک آپادانا
+
 import React from "react";
 import { formatNumber } from "~/lib/utils";
 
@@ -8,10 +11,10 @@ export type CompanyInfo = {
   costReduction: number;
   revenue?: number;
   capacity?: number;
-  costI : number,
+  costI: number;
-  capacityI : number,
+  capacityI: number;
-  revenueI : number,
+  revenueI: number;
-  cost : number | string, 
+  cost: number | string;
 };
 
 export type D3ImageInfoProps = {
@@ -21,6 +24,8 @@ export type D3ImageInfoProps = {
 };
 
 const InfoBox = ({ company, style }: { company: CompanyInfo; style: any }) => {
+  // const hideCapacity = company.name === "واحد 300"; // اگر واحد 300 بود ظرفیت مخفی شود
+  const hideCapacity = false;
   return (
     <div className={`info-box`} style={style}>
       <div className="info-box-content">
@@ -31,32 +36,53 @@ const InfoBox = ({ company, style }: { company: CompanyInfo; style :any }) => {
         </div>
         <div className="info-row">
           <div className="info-label">هزینه:</div>
+          {hideCapacity ? (
+            <div className="info-value cost2 text-[12px]">{formatNumber(company?.cost || 0)}</div>
+          ) : (
             <div className="info-value cost text-[12px]">{formatNumber(company?.cost || 0)}</div>
+          )}
           <div className="info-unit">میلیون ریال</div>
         </div>
+        {!hideCapacity && (
           <div className="info-row">
             <div className="info-label">ظرفیت:</div>
             <div className="info-value capacity text-[12px]">{formatNumber(company?.capacity || 0)}</div>
             <div className="info-unit">تن در سال</div>
           </div>
+        )}
       </div>
     </div>
   );
 };
 
 export function D3ImageInfo({ companies }: D3ImageInfoProps) {
-  // Ensure we have exactly 6 companies
+  // واحدهای جدید - 4 واحد
-  const displayCompanies = companies;
+  const sample = [
+    { id: "واحد 100", name: "واحد 100", imageUrl: "/abniro.png" },
+    { id: "واحد 200", name: "واحد 200", imageUrl: "/besparan.png" },
+    { id: "واحد 300", name: "واحد 300", imageUrl: "/khwarazmi.png" },
+    { id: "واحد 400", name: "واحد 400", imageUrl: "/faravash1.png" }
+  ];
 
-  // Positions inside a 5x4 grid (col, row)
+
-  // Layout keeps same visual logic: left/middle/right on two bands with spacing grid around
+
+  const merged = sample.map(company => {
+    const found = companies.find(item => item.id === company.id);
+    return found
+      ? found
+      : { ...company, cost: 0, capacity: 0, revenue: 0, costReduction: 0, costI: 0, capacityI: 0, revenueI: 0 };
+  });
+
+  const displayCompanies = merged;
+  console.log(displayCompanies);
+
+  // موقعیت‌های جدید برای چیدمان لوزی شکل (3 ردیف - 1-2-1)
+  // گرید 5x4 نگه داشته شده اما موقعیت‌ها تغییر کرده
   const gridPositions = [
-    { col: 2, row: 2 , colI : 1 , rowI : 2 , name : "بسپاران"}, // left - top band
+    { col: 2, row: 1, colI: 1, rowI: 1, name: "واحد 100" }, // ردیف اول - ستون اول
-    { col: 3, row: 2  , colI : 3 , rowI : 1 , name : "خوارزمی"}, // middle top (image sits in row 2, info box goes to row 1)
+    { col: 4, row: 1, colI: 5, rowI: 1, name: "واحد 200" }, // ردیف اول - ستون دوم
-    { col: 4, row: 2 ,colI : 5 , rowI : 2 , name : "فراورش 1"}, // right - top band
+    { col: 2, row: 3, colI: 1, rowI: 3, name: "واحد 300" }, // ردیف دوم - ستون اول
-    { col: 2, row: 3 , colI : 1 , rowI : 3 , name : "کیمیا"}, // left - bottom band
+    { col: 4, row: 3, colI: 5, rowI: 3, name: "واحد 400" }, // ردیف دوم - ستون دوم
-    { col: 3, row: 3 ,  colI : 3, rowI : 4  , name : "آب نیرو"}, // middle bottom (image sits in row 3, info box goes to row 4)
-    { col: 4, row: 3  ,  colI : 5 , rowI : 3 , name : "فراورش 2"}, // right - bottom band
   ];
 
   return (
@@ -65,24 +91,23 @@ export function D3ImageInfo({ companies }: D3ImageInfoProps) {
         {displayCompanies.map((company, index) => {
           const gp = gridPositions.find(v => v.name === company.name);
           return (
-          <>
+            <React.Fragment key={company.id}>
               <div
-              key={company.id}
                 className={`company-item`}
-              style={{ gridColumn: gp.col, gridRow: gp.row }}
+                style={{ gridColumn: gp?.col, gridRow: gp?.row }}
               >
-              <div className="company-image-containe">
+                <div className="company-image-container">
                   <img
                     src={company.imageUrl}
                     alt={company.name}
                     className="company-image"
                   />
                 </div>
-
                 {company.name}
               </div>
-              <InfoBox company={company} key={index +10} style={{ gridColumn: gp?.colI , gridRow: gp?.rowI  }}  />
+              <InfoBox company={company} style={{ gridColumn: gp?.colI, gridRow: gp?.rowI }} />
-          </>);
+            </React.Fragment>
+          );
         })}
       </div>
 
@@ -124,10 +149,10 @@ export function D3ImageInfo({ companies }: D3ImageInfoProps) {
           align-self: center;
           justify-self: center;
           padding: .2rem 1.2rem;
+          min-width: 8rem;
           background-color: transparent;
         }
 
-
         .info-box-content {
           display: flex;
           flex-direction: column;
@@ -141,10 +166,14 @@ export function D3ImageInfo({ companies }: D3ImageInfoProps) {
           gap: .5rem;
           justify-content: space-between;
           direction: rtl;
+        }
 
-          &:has(.info-value.revenue) {border-bottom: 1px solid #3AEA83;}
+        .info-row:has(.info-value.revenue) {
-          &:has(.info-value.cost) {border-bottom: 1px solid #F76276;}
+          border-bottom: 1px solid #3AEA83;
+        }
 
+        .info-row:has(.info-value.cost) {
+          border-bottom: 1px solid #F76276;
         }
 
         .info-label {
@@ -165,6 +194,7 @@ export function D3ImageInfo({ companies }: D3ImageInfoProps) {
 
         .info-value.revenue { color: #fff; }
         .info-value.cost { color: #fff; }
+        .info-value.cost2 { color: #fff; }
         .info-value.capacity { color: #fff; }
 
         .info-unit {

app/components/dashboard/d3-image-info1.tsx

@@ -0,0 +1,213 @@
+//این فایل مخصوص
+//شماتیک بندر امام
+import React from "react";
+import { formatNumber } from "~/lib/utils";
+
+export type CompanyInfo = {
+  id: string;
+  imageUrl: string;
+  name: string;
+  costReduction: number;
+  revenue?: number;
+  capacity?: number;
+  costI : number,
+  capacityI : number,
+  revenueI : number,
+  cost : number | string,
+};
+
+export type D3ImageInfoProps = {
+  companies: CompanyInfo[];
+  width?: number;
+  height?: number;
+};
+
+const InfoBox = ({ company, style }: { company: CompanyInfo; style :any }) => {
+  const hideCapacity = company.name === "خوارزمی"; // اگر خوارزمی بود ظرفیت مخفی شود
+  return (
+    <div className={`info-box`}  style={style}>
+      <div className="info-box-content">
+        <div className="info-row">
+          <div className="info-label">درآمد:</div>
+          <div className="info-value revenue text-[12px]">{formatNumber(company?.revenue || 0)}</div>
+          <div className="info-unit">میلیون ریال</div>
+        </div>
+        <div className="info-row">
+          <div className="info-label">هزینه:</div>
+          {
+            (hideCapacity ? 
+              
+          <div className="info-value cost2 text-[12px]">{formatNumber(company?.cost || 0)}</div>
+          :
+          <div className="info-value cost text-[12px]">{formatNumber(company?.cost || 0)}</div>
+             )
+
+          }
+          <div className="info-unit">میلیون ریال</div>
+        </div>
+        {!hideCapacity && (
+          <div className="info-row">
+            <div className="info-label">ظرفیت:</div>
+            <div className="info-value capacity text-[12px]">{formatNumber(company?.capacity || 0)}</div>
+            <div className="info-unit">تن در سال</div>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export function D3ImageInfo({ companies }: D3ImageInfoProps) {
+  // Ensure we have exactly 6 companies
+
+  const sample = [
+    { id: "آب نیرو", name: "آب نیرو", imageUrl: "/abniro.png" },
+    { id: "بسپاران", name: "بسپاران", imageUrl: "/besparan.png" },
+    { id: "خوارزمی", name: "خوارزمی", imageUrl: "/khwarazmi.png" },
+    { id: "فراورش 1", name: "فراورش 1", imageUrl: "/faravash1.png" },
+    { id: "فراورش 2", name: "فراورش 2", imageUrl: "/faravash2.png" },
+    { id: "کیمیا", name: "کیمیا", imageUrl: "/kimia.png" }
+  ];
+  const merged = sample.map(company => {
+    const found = companies.find(item => item.id == company.id);
+    return found
+      ? found
+      : { ...company, cost: 0, capacity: 0, revenue: 0 };
+  });
+
+  const displayCompanies = merged;
+  console.log(displayCompanies)
+
+  // Positions inside a 5x4 grid (col, row)
+  // Layout keeps same visual logic: left/middle/right on two bands with spacing grid around
+  const gridPositions = [
+    { col: 2, row: 2 , colI : 1 , rowI : 2 , name : "بسپاران"}, // left - top band
+    { col: 3, row: 2  , colI : 3 , rowI : 1 , name : "خوارزمی"}, // middle top (image sits in row 2, info box goes to row 1)
+    { col: 4, row: 2 ,colI : 5 , rowI : 2 , name : "فراورش 1"}, // right - top band
+    { col: 2, row: 3 , colI : 1 , rowI : 3 , name : "کیمیا"}, // left - bottom band
+    { col: 3, row: 3 ,  colI : 3, rowI : 4  , name : "آب نیرو"}, // middle bottom (image sits in row 3, info box goes to row 4)
+    { col: 4, row: 3  ,  colI : 5 , rowI : 3 , name : "فراورش 2"}, // right - bottom band
+  ];
+
+  return (
+    <div className="w-full h-[500px] rounded-xl">
+      <div dir="ltr" className="company-grid-container">
+        {displayCompanies.map((company, index) => {
+          const gp  = gridPositions.find(v => v.name === company.name)  ;
+          return (
+          <>
+            <div
+              key={company.id}
+              className={`company-item`}
+              style={{ gridColumn: gp.col, gridRow: gp.row }}
+            >
+              <div className="company-image-containe">
+                <img
+                  src={company.imageUrl}
+                  alt={company.name}
+                  className="company-image"
+                />
+              </div>
+
+              {company.name}
+            </div>
+              <InfoBox company={company} key={index +10} style={{ gridColumn: gp?.colI , gridRow: gp?.rowI  }}  />
+          </>);
+        })}
+      </div>
+
+      <style jsx>{`
+        .company-grid-container {
+          display: grid;
+          grid-template-columns: repeat(5, 1fr);
+          grid-template-rows: repeat(4, 1fr);
+          gap: 5px;
+          width: 100%;
+          height: 500px;
+        }
+
+        .company-item {
+          border-radius: 8px;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+        }
+
+        .company-image-container {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 100%;
+          height: 100%;
+        }
+
+        .company-image {
+          object-fit: contain;
+          height : 100px;
+        }
+
+        .info-box {
+          border: 1px solid #3F415A;
+          border-radius: 10px;
+          height: max-content;
+          align-self : center;
+          justify-self : center;
+          padding : .2rem 1.2rem;
+          min-width : 8rem;
+          background-color: transparent;
+        }
+
+
+        .info-box-content {
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+        }
+
+        .info-row {
+          position : relative;
+          margin: .1rem 0;
+          display: flex;
+          gap : .5rem;
+          justify-content : space-between;
+          direction: rtl;
+
+          &:has(.info-value.revenue) {border-bottom: 1px solid #3AEA83;}
+          &:has(.info-value.cost) {border-bottom: 1px solid #F76276;}
+
+        }
+
+        .info-label {
+          color: #FFFFFF;
+          font-size: 11px;
+          font-weight: 300;
+          text-align: right;
+          margin : auto 0;
+        }
+
+        .info-value {
+          color: #34D399;
+          font-size: 14px;
+          font-weight: 500;
+          text-align: right;
+          margin-bottom : .5rem;
+        }
+
+        .info-value.revenue { color: #fff;}
+        .info-value.cost { color: #fff; }
+        .info-value.cost2 { color: #fff; }
+        .info-value.capacity { color: #fff; }
+
+        .info-unit {
+          position: absolute;
+          left: 0;
+          bottom: 2px;
+          color: #ACACAC;
+          font-size: 6px;
+          font-weight: 400;
+        }
+      `}</style>
+    </div>
+  );
+}

app/components/dashboard/d3-image-info3.tsx

@@ -0,0 +1,211 @@
+//این فایل مخصوص
+//شماتیک نوری
+
+import React from "react";
+import { formatNumber } from "~/lib/utils";
+
+export type CompanyInfo = {
+  id: string;
+  imageUrl: string;
+  name: string;
+  costReduction: number;
+  revenue?: number;
+  capacity?: number;
+  costI: number;
+  capacityI: number;
+  revenueI: number;
+  cost: number | string;
+};
+
+export type D3ImageInfoProps = {
+  companies: CompanyInfo[];
+  width?: number;
+  height?: number;
+};
+
+const InfoBox = ({ company, style }: { company: CompanyInfo; style: any }) => {
+  // const hideCapacity = company.name === "واحد 300"; // اگر واحد 300 بود ظرفیت مخفی شود
+  const hideCapacity = false;
+  return (
+    <div className={`info-box`} style={style}>
+      <div className="info-box-content">
+        <div className="info-row">
+          <div className="info-label">درآمد:</div>
+          <div className="info-value revenue text-[12px]">{formatNumber(company?.revenue || 0)}</div>
+          <div className="info-unit">میلیون ریال</div>
+        </div>
+        <div className="info-row">
+          <div className="info-label">هزینه:</div>
+          {hideCapacity ? (
+            <div className="info-value cost2 text-[12px]">{formatNumber(company?.cost || 0)}</div>
+          ) : (
+            <div className="info-value cost text-[12px]">{formatNumber(company?.cost || 0)}</div>
+          )}
+          <div className="info-unit">میلیون ریال</div>
+        </div>
+        {!hideCapacity && (
+          <div className="info-row">
+            <div className="info-label">ظرفیت:</div>
+            <div className="info-value capacity text-[12px]">{formatNumber(company?.capacity || 0)}</div>
+            <div className="info-unit">تن در سال</div>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export function D3ImageInfo({ companies }: D3ImageInfoProps) {
+  // واحدهای جدید - 4 واحد
+  const sample = [
+    { id: "واحد 100", name: "واحد 100", imageUrl: "/abniro.png" },
+    { id: "واحد 200", name: "واحد 200", imageUrl: "/besparan.png" },
+    { id: "واحد 300", name: "واحد 300", imageUrl: "/khwarazmi.png" },
+    { id: "واحد 400", name: "واحد 400", imageUrl: "/faravash1.png" }
+  ];
+
+
+
+  const merged = sample.map(company => {
+    const found = companies.find(item => item.id === company.id);
+    return found
+      ? found
+      : { ...company, cost: 0, capacity: 0, revenue: 0, costReduction: 0, costI: 0, capacityI: 0, revenueI: 0 };
+  });
+
+  const displayCompanies = merged;
+  console.log(displayCompanies);
+
+  // موقعیت‌های جدید برای چیدمان لوزی شکل (3 ردیف - 1-2-1)
+  // گرید 5x4 نگه داشته شده اما موقعیت‌ها تغییر کرده
+  const gridPositions = [
+    { col: 2, row: 1, colI: 1, rowI: 1, name: "واحد 100" }, // ردیف اول - ستون اول
+    { col: 4, row: 1, colI: 5, rowI: 1, name: "واحد 200" }, // ردیف اول - ستون دوم
+    { col: 2, row: 3, colI: 1, rowI: 3, name: "واحد 300" }, // ردیف دوم - ستون اول
+    { col: 4, row: 3, colI: 5, rowI: 3, name: "واحد 400" }, // ردیف دوم - ستون دوم
+  ];
+
+  return (
+    <div className="w-full h-[500px] rounded-xl">
+      <div dir="ltr" className="company-grid-container">
+        {displayCompanies.map((company, index) => {
+          const gp = gridPositions.find(v => v.name === company.name);
+          return (
+            <React.Fragment key={company.id}>
+              <div
+                className={`company-item`}
+                style={{ gridColumn: gp?.col, gridRow: gp?.row }}
+              >
+                <div className="company-image-container">
+                  <img
+                    src={company.imageUrl}
+                    alt={company.name}
+                    className="company-image"
+                  />
+                </div>
+                {company.name}
+              </div>
+              <InfoBox company={company} style={{ gridColumn: gp?.colI, gridRow: gp?.rowI }} />
+            </React.Fragment>
+          );
+        })}
+      </div>
+
+      <style jsx>{`
+        .company-grid-container {
+          display: grid;
+          grid-template-columns: repeat(5, 1fr);
+          grid-template-rows: repeat(4, 1fr);
+          gap: 5px;
+          width: 100%;
+          height: 500px;
+        }
+
+        .company-item {
+          border-radius: 8px;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+        }
+
+        .company-image-container {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 100%;
+          height: 100%;
+        }
+
+        .company-image {
+          object-fit: contain;
+          height: 100px;
+        }
+
+        .info-box {
+          border: 1px solid #3F415A;
+          border-radius: 10px;
+          height: max-content;
+          align-self: center;
+          justify-self: center;
+          padding: .2rem 1.2rem;
+          min-width: 8rem;
+          background-color: transparent;
+        }
+
+        .info-box-content {
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+        }
+
+        .info-row {
+          position: relative;
+          margin: .1rem 0;
+          display: flex;
+          gap: .5rem;
+          justify-content: space-between;
+          direction: rtl;
+        }
+
+        .info-row:has(.info-value.revenue) {
+          border-bottom: 1px solid #3AEA83;
+        }
+
+        .info-row:has(.info-value.cost) {
+          border-bottom: 1px solid #F76276;
+        }
+
+        .info-label {
+          color: #FFFFFF;
+          font-size: 11px;
+          font-weight: 300;
+          text-align: right;
+          margin: auto 0;
+        }
+
+        .info-value {
+          color: #34D399;
+          font-size: 14px;
+          font-weight: 500;
+          text-align: right;
+          margin-bottom: .5rem;
+        }
+
+        .info-value.revenue { color: #fff; }
+        .info-value.cost { color: #fff; }
+        .info-value.cost2 { color: #fff; }
+        .info-value.capacity { color: #fff; }
+
+        .info-unit {
+          position: absolute;
+          left: 0;
+          bottom: 2px;
+          color: #ACACAC;
+          font-size: 6px;
+          font-weight: 400;
+        }
+      `}</style>
+    </div>
+  );
+}

app/components/dashboard/dashboard-custom-bar-chart.tsx

@@ -1,5 +1,10 @@
 import React from "react";
 import { formatNumber } from "~/lib/utils";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "~/components/ui/tooltip"
 
 interface DataItem {
   label: string;
@@ -54,12 +59,27 @@ export function DashboardCustomBarChart({
               <div className="flex-row-reverse items-center gap-2 flex min-h-6 h-10 rounded-lg overflow-hidden">
                 {/* Animated bar */}
                 <div
-                  className={`h-auto gap-2 ${item.color} rounded-lg transition-all duration-1000 ease-out flex items-center justify-end px-2`}
+                  className={`h-auto gap-2 overflow-hidden ${item.color} rounded-lg transition-all duration-1000 ease-out flex items-center justify-end px-2`}
                   style={{ width: `${widthPercentage}%` }}
                 >
-                  <span className="text-[#3F415A] text-left font-persian font-medium text-sm py-1 w-max">
+                  { widthPercentage > 20 ? (
+                  <span className="text-[#3F415A] min-w-max text-left font-persian font-medium text-sm py-1 w-max">
                     {item.label}
                   </span>
+                  ) : (
+                  <Tooltip>
+                        <TooltipTrigger  className={`${item.color}`} asChild>
+                          <span className="text-[#3F415A]  text-left font-persian font-medium text-sm py-1">
+                           <span className="invisible">""</span>
+                                            </span>
+
+                        </TooltipTrigger>
+                        <TooltipContent className={`${item.color} ${item.color.replace("bg","fill")}`}>
+                          <p className="font-persian text-sm">{item.label}</p>
+                        </TooltipContent>
+
+                      </Tooltip>
+                ) }
                 </div>
                   <span className="text-white font-bold text-base">
                     {formatNumber(item.value)}

app/components/dashboard/dashboard-home.tsx

@@ -1,38 +1,6 @@
-import { useState, useEffect } from "react";
+import { Book, CheckCircle } from "lucide-react";
-import { DashboardLayout } from "./layout";
+import { useEffect, useState } from "react";
-import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
-import { Progress } from "~/components/ui/progress";
-import { Badge } from "~/components/ui/badge";
-import { Button } from "~/components/ui/button";
-import {
-  BarChart,
-  Bar,
-  XAxis,
-  YAxis,
-  CartesianGrid,
-  Tooltip,
-  ResponsiveContainer,
-  LineChart,
-  Line,
-} from "recharts";
-import apiService from "~/lib/api";
 import toast from "react-hot-toast";
-import {
-  Calendar,
-  TrendingUp,
-  TrendingDown,
-  Target,
-  Lightbulb,
-  DollarSign,
-  Minus,
-  CheckCircle,
-  Book,
-} from "lucide-react";
-import { Tabs, TabsList, TabsTrigger, TabsContent } from "~/components/ui/tabs";
-import { CustomBarChart } from "~/components/ui/custom-bar-chart";
-import { DashboardCustomBarChart } from "./dashboard-custom-bar-chart";
-import { InteractiveBarChart } from "./interactive-bar-chart";
-import { D3ImageInfo } from "./d3-image-info";
 import {
   Label,
   PolarGrid,
@@ -40,10 +8,21 @@ import {
   RadialBar,
   RadialBarChart,
 } from "recharts";
-import { ChartContainer } from "~/components/ui/chart";
-import { formatNumber } from "~/lib/utils";
-import { MetricCard } from "~/components/ui/metric-card";
 import { BaseCard } from "~/components/ui/base-card";
+import { Button } from "~/components/ui/button";
+import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
+import { ChartContainer } from "~/components/ui/chart";
+import { MetricCard } from "~/components/ui/metric-card";
+import { Progress } from "~/components/ui/progress";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "~/components/ui/tabs";
+import { useStoredDate } from "~/hooks/useStoredDate";
+import apiService from "~/lib/api";
+import { EventBus, formatNumber } from "~/lib/utils";
+import type { CalendarDate } from "~/types/util.type";
+import { D3ImageInfo } from "./d3-image-info";
+import { DashboardCustomBarChart } from "./dashboard-custom-bar-chart";
+import { InteractiveBarChart } from "./interactive-bar-chart";
+import { DashboardLayout } from "./layout";
 
 export function DashboardHome() {
   const [dashboardData, setDashboardData] = useState<any | null>(null);
@@ -51,35 +30,54 @@ export function DashboardHome() {
   const [error, setError] = useState<string | null>(null);
   // Chart and schematic data from select API
   const [companyChartData, setCompanyChartData] = useState<
-    { category: string; capacity: number; revenue: number; cost: number ,  costI : number,
+    {
-          capacityI : number,
+      category: string;
-          revenueI : number }[]
+      capacity: number;
+      revenue: number;
+      cost: number;
+      costI: number;
+      capacityI: number;
+      revenueI: number;
+    }[]
   >([]);
-  const [totalIncreasedCapacity, setTotalIncreasedCapacity] = useState<number>(0);
+
+  const [date, setDate] = useStoredDate();
 
   useEffect(() => {
-    fetchDashboardData();
+    const handler = (date: CalendarDate) => {
+      if (date) setDate(date);
+    };
+
+    EventBus.on("dateSelected", handler);
+
+    return () => {
+      EventBus.off("dateSelected", handler);
+    };
   }, []);
 
+  useEffect(() => {
+    if (date?.end && date?.start) fetchDashboardData();
+  }, [date]);
+
   const fetchDashboardData = async () => {
     try {
       setLoading(true);
       setError(null);
 
-      // First authenticate if needed
-      const token = localStorage.getItem("auth_token");
-      if (!token) {
-        await apiService.login("inogen_admin", "123456");
-      }
-
       // Fetch top cards data
       const topCardsResponse = await apiService.call({
-        main_page_first_function: {},
+        main_page_first_function: {
+          start_date: date.start || null,
+          end_date: date.end || null,
+        },
       });
 
       // Fetch left section data
       const leftCardsResponse = await apiService.call({
-        main_page_second_function: {},
+        main_page_second_function: {
+          start_date: date.start || null,
+          end_date: date.end || null,
+        },
       });
 
       const topCardsResponseData = JSON.parse(topCardsResponse?.data);
@@ -112,6 +110,10 @@ export function DashboardHome() {
           "sum(pre_project_income)",
           "sum(increased_income_after_innovation)",
         ],
+        Conditions: [
+          ["start_date", ">=", date.start || null, "and"],
+          ["start_date", "<=", date.end || null],
+        ],
         GroupBy: ["related_company"],
       };
 
@@ -130,12 +132,30 @@ export function DashboardHome() {
       let incCapacityTotal = 0;
       const chartRows = rows.map((r) => {
         const rel = r?.related_company ?? "-";
-        const preFee = Number(r?.pre_innovation_fee_sum  ?? 0)  >= 0 ? r?.pre_innovation_fee_sum  : 0;
+        const preFee =
-        const costRed = Number(r?.innovation_cost_reduction_sum ?? 0)  >= 0 ? r?.innovation_cost_reduction_sum : 0;
+          Number(r?.pre_innovation_fee_sum ?? 0) >= 0
-        const preCap = Number(r?.pre_project_production_capacity_sum ?? 0)  >= 0 ? r?.pre_project_production_capacity_sum : 0;
+            ? r?.pre_innovation_fee_sum
-        const incCap = Number(r?.increased_capacity_after_innovation_sum ?? 0)  >= 0 ? r?.increased_capacity_after_innovation_sum : 0;
+            : 0;
-        const preInc = Number(r?.pre_project_income_sum ?? 0)  >= 0 ? r?.pre_project_income_sum : 0;
+        const costRed =
-        const incInc = Number(r?.increased_income_after_innovation_sum ?? 0)  >= 0 ? r?.increased_income_after_innovation_sum : 0;
+          Number(r?.innovation_cost_reduction_sum ?? 0) >= 0
+            ? r?.innovation_cost_reduction_sum
+            : 0;
+        const preCap =
+          Number(r?.pre_project_production_capacity_sum ?? 0) >= 0
+            ? r?.pre_project_production_capacity_sum
+            : 0;
+        const incCap =
+          Number(r?.increased_capacity_after_innovation_sum ?? 0) >= 0
+            ? r?.increased_capacity_after_innovation_sum
+            : 0;
+        const preInc =
+          Number(r?.pre_project_income_sum ?? 0) >= 0
+            ? r?.pre_project_income_sum
+            : 0;
+        const incInc =
+          Number(r?.increased_income_after_innovation_sum ?? 0) >= 0
+            ? r?.increased_income_after_innovation_sum
+            : 0;
 
         incCapacityTotal += incCap;
 
@@ -149,12 +169,12 @@ export function DashboardHome() {
           cost: isFinite(costPct) ? costPct : 0,
           costI: costRed,
           capacityI: incCap,
-          revenueI : incInc
+          revenueI: incInc,
         };
       });
 
       setCompanyChartData(chartRows);
-      setTotalIncreasedCapacity(incCapacityTotal);
+      // setTotalIncreasedCapacity(incCapacityTotal);
     } catch (error) {
       console.error("Error fetching dashboard data:", error);
       const errorMessage =
@@ -167,25 +187,24 @@ export function DashboardHome() {
   };
 
   // RadialBarChart data for ideas visualization
-  const getIdeasChartData = () => {
+  // const getIdeasChartData = () => {
-    if (!dashboardData?.topData)
+  //   if (!dashboardData?.topData)
-      return [{ browser: "safari", visitors: 0, fill: "var(--color-safari)" }];
+  //     return [{ browser: "safari", visitors: 0, fill: "var(--color-safari)" }];
 
-    const registered = parseFloat(
+  //   const registered = parseFloat(
-      dashboardData.topData.registered_innovation_technology_idea || "0",
+  //     dashboardData.topData.registered_innovation_technology_idea || "0"
-    );
+  //   );
-    const ongoing = parseFloat(
+  //   const ongoing = parseFloat(
-      dashboardData.topData.ongoing_innovation_technology_ideas || "0",
+  //     dashboardData.topData.ongoing_innovation_technology_ideas || "0"
-    );
+  //   );
-    const percentage =
+  //   const percentage = registered > 0 ? (ongoing / registered) * 100 : 0;
-      registered > 0 ? (ongoing / registered) * 100 : 0;
 
-    return [
+  //   return [
-      { browser: "safari", visitors: percentage, fill: "var(--color-safari)" },
+  //     { browser: "safari", visitors: percentage, fill: "var(--color-safari)" },
-    ];
+  //   ];
-  };
+  // };
 
-  const chartData = getIdeasChartData();
+  // const chartData = getIdeasChartData();
 
   const chartConfig = {
     visitors: {
@@ -329,20 +348,19 @@ export function DashboardHome() {
                       visitors:
                         parseFloat(
                           dashboardData.topData
-                            ?.registered_innovation_technology_idea || "0",
+                            ?.registered_innovation_technology_idea || "0"
                         ) > 0
                           ? Math.round(
                               (parseFloat(
                                 dashboardData.topData
-                                  ?.ongoing_innovation_technology_ideas ||
+                                  ?.ongoing_innovation_technology_ideas || "0"
-                                  "0",
                               ) /
                                 parseFloat(
                                   dashboardData.topData
                                     ?.registered_innovation_technology_idea ||
-                                    "1",
+                                    "1"
                                 )) *
-                                100,
+                                100
                             )
                           : 0,
                       fill: "var(--color-green)",
@@ -353,19 +371,18 @@ export function DashboardHome() {
                     90 +
                     ((parseFloat(
                       dashboardData.topData
-                        ?.registered_innovation_technology_idea || "0",
+                        ?.registered_innovation_technology_idea || "0"
                     ) > 0
                       ? Math.round(
                           (parseFloat(
                             dashboardData.topData
-                              ?.ongoing_innovation_technology_ideas || "0",
+                              ?.ongoing_innovation_technology_ideas || "0"
                           ) /
                             parseFloat(
                               dashboardData.topData
-                                ?.registered_innovation_technology_idea ||
+                                ?.registered_innovation_technology_idea || "1"
-                                "1",
                             )) *
-                            100,
+                            100
                         )
                       : 0) /
                       100) *
@@ -381,11 +398,7 @@ export function DashboardHome() {
                     className="first:fill-pr-red last:fill-[#24273A]"
                     polarRadius={[38, 31]}
                   />
-                  <RadialBar
+                  <RadialBar dataKey="visitors" background cornerRadius={5} />
-                    dataKey="visitors"
-                    background
-                    cornerRadius={5}
-                  />
                   <PolarRadiusAxis
                     tick={false}
                     tickLine={false}
@@ -411,22 +424,22 @@ export function DashboardHome() {
                                   parseFloat(
                                     dashboardData.topData
                                       ?.registered_innovation_technology_idea ||
-                                      "0",
+                                      "0"
                                   ) > 0
                                     ? Math.round(
                                         (parseFloat(
                                           dashboardData.topData
                                             ?.ongoing_innovation_technology_ideas ||
-                                            "0",
+                                            "0"
                                         ) /
                                           parseFloat(
                                             dashboardData.topData
                                               ?.registered_innovation_technology_idea ||
-                                              "1",
+                                              "1"
                                           )) *
-                                          100,
+                                          100
                                       )
-                                    : 0,
+                                    : 0
                                 )}
                               </tspan>
                             </text>
@@ -443,14 +456,14 @@ export function DashboardHome() {
                     <div className="font-light text-sm">ثبت شده :</div>
                     {formatNumber(
                       dashboardData.topData
-                        ?.registered_innovation_technology_idea || "0",
+                        ?.registered_innovation_technology_idea || "0"
                     )}
                   </span>
                   <span className="flex items-center gap-1 font-bold text-base">
                     <div className="font-light text-sm">در حال اجرا :</div>
                     {formatNumber(
                       dashboardData.topData
-                        ?.ongoing_innovation_technology_ideas || "0",
+                        ?.ongoing_innovation_technology_ideas || "0"
                     )}
                   </span>
                 </div>
@@ -460,16 +473,34 @@ export function DashboardHome() {
           {/* Revenue Card */}
           <MetricCard
             title="افزایش درآمد مبتنی بر فناوری و نوآوری"
-            value={dashboardData.topData?.technology_innovation_based_revenue_growth?.replaceAll("," , "") || "0"}
+            value={
-            percentValue={dashboardData.topData?.technology_innovation_based_revenue_growth_percent}
+              dashboardData.topData?.technology_innovation_based_revenue_growth?.replaceAll(
+                ",",
+                ""
+              ) || "0"
+            }
+            percentValue={
+              dashboardData.topData
+                ?.technology_innovation_based_revenue_growth_percent
+            }
             percentLabel="درصد به کل درآمد"
           />
 
           {/* Cost Reduction Card */}
           <MetricCard
             title="کاهش هزینه ها مبتنی بر فناوری و نوآوری"
-            value={Math.round(parseFloat(dashboardData.topData?.technology_innovation_based_cost_reduction?.replace(/,/g, "") || "0"))}
+            value={Math.round(
-            percentValue={dashboardData.topData?.technology_innovation_based_cost_reduction_percent || "0"}
+              parseFloat(
+                dashboardData.topData?.technology_innovation_based_cost_reduction?.replace(
+                  /,/g,
+                  ""
+                ) || "0"
+              )
+            )}
+            percentValue={
+              dashboardData.topData
+                ?.technology_innovation_based_cost_reduction_percent || "0"
+            }
             percentLabel="درصد به کل هزینه"
           />
 
@@ -486,7 +517,7 @@ export function DashboardHome() {
                       browser: "budget",
                       visitors: parseFloat(
                         dashboardData.topData
-                              ?.innovation_budget_achievement_percent || "0",
+                          ?.innovation_budget_achievement_percent || "0"
                       ),
                       fill: "var(--color-green)",
                     },
@@ -509,11 +540,7 @@ export function DashboardHome() {
                     className="first:fill-pr-red last:fill-[#24273A]"
                     polarRadius={[38, 31]}
                   />
-                      <RadialBar
+                  <RadialBar dataKey="visitors" background cornerRadius={5} />
-                        dataKey="visitors"
-                        background
-                        cornerRadius={5}
-                      />
                   <PolarRadiusAxis
                     tick={false}
                     tickLine={false}
@@ -539,8 +566,8 @@ export function DashboardHome() {
                                   Math.round(
                                     dashboardData.topData
                                       ?.innovation_budget_achievement_percent ||
-                                          0,
+                                      0
-                                      ),
+                                  )
                                 )}
                               </tspan>
                             </text>
@@ -560,10 +587,10 @@ export function DashboardHome() {
                         parseFloat(
                           dashboardData.topData?.approved_innovation_budget_achievement_ratio?.replace(
                             /,/g,
-                                "",
+                            ""
-                              ) || "0",
+                          ) || "0"
-                            ),
+                        )
-                          ),
+                      )
                     )}
                   </span>
                   <span className="flex items-center gap-1 text-base font-bold mr-auto">
@@ -573,10 +600,10 @@ export function DashboardHome() {
                         parseFloat(
                           dashboardData.topData?.allocated_innovation_budget_achievement_ratio?.replace(
                             /,/g,
-                                "",
+                            ""
-                              ) || "0",
+                          ) || "0"
-                            ),
+                        )
-                          ),
+                      )
                     )}
                   </span>
                 </div>
@@ -587,18 +614,21 @@ export function DashboardHome() {
 
         {/* Main Content with Tabs */}
         <Tabs
-          defaultValue="charts"
+          defaultValue="canvas"
           className="grid overflow-hidden rounded-lg grid-rows-[max-content] items-center col-span-2 row-start-2 bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)]"
         >
           <div className="flex items-center border-b border-gray-600 justify-between gap-2">
             <p className="p-6 font-persian font-semibold text-lg ">
               تحقق ارزش ها
             </p>
-            <TabsList className="bg-transparent py-2 border m-6 border-gray-600">
+            <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 ">
+              <TabsTrigger
+                value="charts"
+                className=" text-white cursor-pointer font-light "
+              >
                 مقایسه ای
               </TabsTrigger>
             </TabsList>
@@ -611,17 +641,39 @@ export function DashboardHome() {
           <TabsContent value="canvas" className="w-ful h-full">
             <div className="p-4 h-full w-full">
               <D3ImageInfo
-                companies={
+              
-                  companyChartData.map((item) => {
+              //پتروشیمی بندر امام
+                // companies={companyChartData.map((item) => {
+                //   const imageMap: Record<string, string> = {
+                //     بسپاران: "/besparan.png",
+                //     خوارزمی: "/khwarazmi.png",
+                //     "فراورش 1": "/faravash1.png",
+                //     "فراورش 2": "/faravash2.png",
+                //     کیمیا: "/kimia.png",
+                //     "آب نیرو": "/abniro.png",
+                //   };
+
+
+                //پتروشیمی آپادانا
+                companies={companyChartData.map((item) => {
                   const imageMap: Record<string, string> = {
-                      "بسپاران": "/besparan.png",
+                    "واحد 100": "/abniro.png" ,
-                      "خوارزمی": "/khwarazmi.png",
+                    "واحد 200": "/besparan.png" ,
-                      "فراورش 1": "/faravash1.png",
+                    "واحد 300": "/khwarazmi.png" ,
-                      "فراورش 2": "/faravash2.png",
+                    "واحد 400": "/faravash1.png" 
-                      "کیمیا": "/kimia.png",
-                      "آب نیرو": "/abniro.png",
                   };
 
+                //پتروشیمی نوری
+                // companies={companyChartData.map((item) => {
+                //   const imageMap: Record<string, string> = {
+                //     "واحد 100": "/abniro.png" ,
+                //     "واحد 200": "/besparan.png" ,
+                //     "واحد 300": "/khwarazmi.png" ,
+                //     "واحد 400": "/faravash1.png" 
+                //   };
+
+
+
                   return {
                     id: item.category,
                     name: item.category,
@@ -630,8 +682,7 @@ export function DashboardHome() {
                     capacity: item?.capacityI || 0,
                     revenue: item?.revenueI || 0,
                   };
-                  })
+                })}
-                }
               />
             </div>
           </TabsContent>
@@ -649,7 +700,7 @@ export function DashboardHome() {
 
                 <Progress
                   value={parseFloat(
-                    dashboardData.leftData?.technology_intensity,
+                    dashboardData.leftData?.technology_intensity
                   )}
                   className="h-4 flex-1"
                 />
@@ -667,21 +718,21 @@ export function DashboardHome() {
                   {
                     label: "اجرا شده",
                     value: parseFloat(
-                      dashboardData?.leftData?.executed_project || "0",
+                      dashboardData?.leftData?.executed_project || "0"
                     ),
                     color: "bg-pr-green",
                   },
                   {
                     label: "در حال اجرا",
                     value: parseFloat(
-                      dashboardData?.leftData?.in_progress_project || "0",
+                      dashboardData?.leftData?.in_progress_project || "0"
                     ),
                     color: "bg-pr-blue",
                   },
                   {
                     label: "برنامه‌ریزی شده",
                     value: parseFloat(
-                      dashboardData?.leftData?.planned_project || "0",
+                      dashboardData?.leftData?.planned_project || "0"
                     ),
                     color: "bg-pr-red",
                   },
@@ -706,7 +757,7 @@ export function DashboardHome() {
                   </div>
                   <span className="text-base font-bold ">
                     {formatNumber(
-                      dashboardData.leftData?.printed_books_count || "0",
+                      dashboardData.leftData?.printed_books_count || "0"
                     )}
                   </span>
                 </div>
@@ -717,7 +768,7 @@ export function DashboardHome() {
                   </div>
                   <span className="text-base font-bold ">
                     {formatNumber(
-                      dashboardData.leftData?.registered_patents_count || "0",
+                      dashboardData.leftData?.registered_patents_count || "0"
                     )}
                   </span>
                 </div>
@@ -728,7 +779,7 @@ export function DashboardHome() {
                   </div>
                   <span className="text-base font-bold ">
                     {formatNumber(
-                      dashboardData.leftData?.published_reports_count || "0",
+                      dashboardData.leftData?.published_reports_count || "0"
                     )}
                   </span>
                 </div>
@@ -739,7 +790,7 @@ export function DashboardHome() {
                   </div>
                   <span className="text-base font-bold ">
                     {formatNumber(
-                      dashboardData.leftData?.printed_articles_count || "0",
+                      dashboardData.leftData?.printed_articles_count || "0"
                     )}
                   </span>
                 </div>
@@ -763,7 +814,7 @@ export function DashboardHome() {
                   </div>
                   <span className="text-base font-bold ">
                     {formatNumber(
-                      dashboardData.leftData?.attended_conferences_count || "0",
+                      dashboardData.leftData?.attended_conferences_count || "0"
                     )}
                   </span>
                 </div>
@@ -774,7 +825,7 @@ export function DashboardHome() {
                   </div>
                   <span className="text-base font-bold ">
                     {formatNumber(
-                      dashboardData.leftData?.attended_events_count || "0",
+                      dashboardData.leftData?.attended_events_count || "0"
                     )}
                   </span>
                 </div>
@@ -785,7 +836,7 @@ export function DashboardHome() {
                   </div>
                   <span className="text-base font-bold ">
                     {formatNumber(
-                      dashboardData.leftData?.attended_exhibitions_count || "0",
+                      dashboardData.leftData?.attended_exhibitions_count || "0"
                     )}
                   </span>
                 </div>
@@ -796,7 +847,7 @@ export function DashboardHome() {
                   </div>
                   <span className="text-base font-bold ">
                     {formatNumber(
-                      dashboardData.leftData?.organized_events_count || "0",
+                      dashboardData.leftData?.organized_events_count || "0"
                     )}
                   </span>
                 </div>
@@ -806,7 +857,6 @@ export function DashboardHome() {
         </div>
       </div>
     </DashboardLayout>
-
   );
 }
 

app/components/dashboard/header.tsx

@@ -1,21 +1,22 @@
-import React, { useEffect, useState } from "react";
+import { saveAs } from "file-saver";
-import { useAuth } from "~/contexts/auth-context";
+import jalaali from "jalaali-js";
-import { Link } from "react-router";
-import { cn } from "~/lib/utils";
-import { Button } from "~/components/ui/button";
 import {
-  PanelLeft,
+  Calendar,
-
-  Settings,
-  User,
-
-  Menu,
-  ChevronDown,
-  Server,
   ChevronLeft,
-
+  FileChartColumnIncreasing,
+  Menu,
+  PanelLeft,
+  Server,
+  User,
 } from "lucide-react";
+import React, { useEffect, useRef, useState } from "react";
+import { useLocation } from "react-router";
+import XLSX from "xlsx-js-style";
+import { Button } from "~/components/ui/button";
+import { Calendar as CustomCalendar } from "~/components/ui/Calendar";
+import { useAuth } from "~/contexts/auth-context";
 import apiService from "~/lib/api";
+import { cn, EventBus, handleDataValue } from "~/lib/utils";
 
 interface HeaderProps {
   onToggleSidebar?: () => void;
@@ -24,6 +25,161 @@ interface HeaderProps {
   titleIcon?: React.ComponentType<{ className?: string }> | null;
 }
 
+interface MonthItem {
+  id: string;
+  label: string;
+  start: string;
+  end: string;
+}
+
+interface CurrentDay {
+  start?: string;
+  end?: string;
+  sinceMonth?: string;
+  fromMonth?: string;
+}
+
+interface SelectedDate {
+  since?: number;
+  until?: number;
+}
+
+const monthList: Array<MonthItem> = [
+  {
+    id: "month-1",
+    label: "بهار",
+    start: "01/01",
+    end: "03/31",
+  },
+  {
+    id: "month-2",
+    label: "تابستان",
+    start: "04/01",
+    end: "06/31",
+  },
+  {
+    id: "month-3",
+    label: "پاییز",
+    start: "07/01",
+    end: "09/31",
+  },
+  {
+    id: "month-4",
+    label: "زمستان",
+    start: "10/01",
+    end: "12/30",
+  },
+];
+
+const columns: Array<any> = [
+  { key: "title", label: "عنوان پروژه", sortable: true, width: "300px" },
+  {
+    key: "importance_project",
+    label: "میزان اهمیت",
+    sortable: true,
+    width: "160px",
+  },
+  {
+    key: "strategic_theme",
+    label: "مضمون راهبردی",
+    sortable: true,
+    width: "200px",
+  },
+  {
+    key: "value_technology_and_innovation",
+    label: "ارزش فناوری و نوآوری",
+    sortable: true,
+    width: "220px",
+  },
+  {
+    key: "type_of_innovation",
+    label: "انواع نوآوری",
+    sortable: true,
+    width: "160px",
+  },
+  {
+    key: "innovation",
+    label: "میزان نوآوری",
+    sortable: true,
+    width: "140px",
+  },
+  {
+    key: "person_executing",
+    label: "مسئول اجرا",
+    sortable: true,
+    width: "180px",
+  },
+  {
+    key: "excellent_observer",
+    label: "ناطر عالی",
+    sortable: true,
+    width: "180px",
+  },
+  { key: "observer", label: "ناظر پروژه", sortable: true, width: "180px" },
+  { key: "moderator", label: "مجری", sortable: true, width: "180px" },
+  {
+    key: "executive_phase",
+    label: "فاز اجرایی",
+    sortable: true,
+    width: "160px",
+  },
+  {
+    key: "start_date",
+    label: "تاریخ شروع",
+    sortable: true,
+    width: "120px",
+  },
+  {
+    key: "remaining_time",
+    label: "زمان باقی مانده",
+    sortable: true,
+    width: "140px",
+    computed: true,
+  },
+  {
+    key: "end_date",
+    label: "تاریخ پایان (برنامه‌ریزی)",
+    sortable: true,
+    width: "160px",
+  },
+  {
+    key: "renewed_duration",
+    label: "مدت زمان تمدید",
+    sortable: true,
+    width: "140px",
+  },
+  {
+    key: "done_date",
+    label: "تاریخ پایان (واقعی)",
+    sortable: true,
+    width: "160px",
+  },
+  {
+    key: "deviation_from_program",
+    label: "متوسط انحراف برنامه‌ای",
+    sortable: true,
+    width: "160px",
+  },
+  {
+    key: "approved_budget",
+    label: "بودجه مصوب",
+    sortable: true,
+    width: "150px",
+  },
+  {
+    key: "budget_spent",
+    label: "بودجه صرف شده",
+    sortable: true,
+    width: "150px",
+  },
+  {
+    key: "cost_deviation",
+    label: "متوسط انحراف هزینه‌ای",
+    sortable: true,
+    width: "160px",
+  },
+];
+
 export function Header({
   onToggleSidebar,
   className,
@@ -31,25 +187,217 @@ export function Header({
   titleIcon,
 }: HeaderProps) {
   const { user } = useAuth();
-  const [isProfileMenuOpen, setIsProfileMenuOpen] = useState(false);
+  const { jy } = jalaali.toJalaali(new Date());
-  const [isNotificationOpen, setIsNotificationOpen] = useState(false);
+
+  const calendarRef = useRef<HTMLDivElement>(null);
+  const [isProfileMenuOpen, setIsProfileMenuOpen] = useState<boolean>(false);
+  const [isNotificationOpen, setIsNotificationOpen] = useState<boolean>(false);
+  const [openCalendar, setOpenCalendar] = useState<boolean>(false);
+  const [excelLoading, setExcelLoading] = useState<boolean>(false);
+  const location = useLocation();
+  const projectManagerRoute = "/dashboard/project-management";
+  const [currentYear, setCurrentYear] = useState<SelectedDate>({
+    since: jy,
+    until: jy,
+  });
+
+  const [selectedDate, setSelectedDate] = useState<CurrentDay>({});
+
+  useEffect(() => {
+    const storedDate = localStorage.getItem("dateSelected");
+    if (storedDate) {
+      const parsedDate = JSON.parse(storedDate);
+      setSelectedDate(parsedDate);
+
+      const sinceYear = parsedDate.start
+        ? parseInt(parsedDate.start.split("/")[0], 10)
+        : jy;
+      const untilYear = parsedDate.end
+        ? parseInt(parsedDate.end.split("/")[0], 10)
+        : jy;
+
+      setCurrentYear({ since: sinceYear, until: untilYear });
+    } else {
+      const defaultDate = {
+        sinceMonth: "بهار",
+        fromMonth: "زمستان",
+        start: `${jy}/01/01`,
+        end: `${jy}/12/30`,
+      };
+      setSelectedDate(defaultDate);
+      localStorage.setItem("dateSelected", JSON.stringify(defaultDate));
+      setCurrentYear({ since: jy, until: jy });
+    }
+  }, []);
 
   const redirectHandler = async () => {
     try {
-      const getData = await apiService.post('/GenerateSsoCode')
+      const getData = await apiService.post("/GenerateSsoCode");
-      //const url = `http://localhost:3000/redirect/${getData.data}`;
+
-       const url = `https://inogen-bpms.pelekan.org/redirect/${getData.data}`;
+      //بندر امام
+      // const url = `https://inogen-bpms.pelekan.org/redirect/${getData.data}`;
+      //آپادانا
+      const url = `https://APADANA-IATM-bpms.pelekan.org/redirect/${getData.data}`;
+      //نوری
+      // const url = `https://NOPC-IATM-bpms.pelekan.org/redirect/${getData.data}`;
+
       window.open(url, "_blank");
     } catch (error) {
       console.log(error);
     }
+  };
+
+  const changeSinceYear = (delta: number) => {
+    if (!currentYear) return;
+
+    const newSince = (currentYear.since ?? 0) + delta;
+
+    if (newSince > (currentYear.until ?? Infinity) || newSince < 0) return;
+
+    const updatedYear = { ...currentYear, since: newSince };
+    setCurrentYear(updatedYear);
+
+    const updatedDate = {
+      ...selectedDate,
+      start: `${newSince}/${selectedDate.start?.split("/").slice(1).join("/")}`,
+    };
+    setSelectedDate(updatedDate);
+    localStorage.setItem("dateSelected", JSON.stringify(updatedDate));
+    EventBus.emit("dateSelected", updatedDate);
+  };
+
+  const nextFromYearHandler = () => changeSinceYear(1);
+  const prevFromYearHandler = () => changeSinceYear(-1);
+
+  const selectFromDateHandler = (val: MonthItem) => {
+    const data = {
+      ...selectedDate,
+      start: `${currentYear.since}/${val.start}`,
+      sinceMonth: val.label,
+    };
+    setSelectedDate(data);
+    localStorage.setItem("dateSelected", JSON.stringify(data));
+    EventBus.emit("dateSelected", data);
+  };
+
+  const changeUntilYear = (delta: number) => {
+    if (!currentYear) return;
+
+    const newUntil = (currentYear.until ?? 0) + delta;
+
+    if (newUntil < (currentYear.since ?? 0)) return;
+
+    const updatedYear = { ...currentYear, until: newUntil };
+    setCurrentYear(updatedYear);
+
+    const updatedDate = {
+      ...selectedDate,
+      end: `${newUntil}/${selectedDate.end?.split("/").slice(1).join("/")}`,
+    };
+    setSelectedDate(updatedDate);
+    localStorage.setItem("dateSelected", JSON.stringify(updatedDate));
+    EventBus.emit("dateSelected", updatedDate);
+  };
+
+  const nextUntilYearHandler = () => changeUntilYear(1);
+  const prevUntilYearHandler = () => changeUntilYear(-1);
+
+  const selectUntilDateHandler = (val: MonthItem) => {
+    const data = {
+      ...selectedDate,
+      end: `${currentYear.until}/${val.end}`,
+      fromMonth: val.label,
+    };
+    setSelectedDate(data);
+    localStorage.setItem("dateSelected", JSON.stringify(data));
+    EventBus.emit("dateSelected", data);
+    toggleCalendar();
+  };
+
+  const toggleCalendar = () => {
+    setOpenCalendar(!openCalendar);
+  };
+
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (
+        calendarRef.current &&
+        !calendarRef.current.contains(event.target as Node)
+      ) {
+        setOpenCalendar(false);
       }
+    };
+    document.addEventListener("mousedown", handleClickOutside);
+    return () => {
+      document.removeEventListener("mousedown", handleClickOutside);
+    };
+  }, []);
+
+  const exportToExcel = async () => {
+    let arr = [];
+    const data: any = await fetchExcelData();
+    for (let i = 0; i < data.length; i++) {
+      let obj: Record<string, any> = {};
+      const project = data[i];
+
+      Object.entries(project).forEach(([pKey, pValue]: [any, any]) => {
+        Object.values(columns).forEach((col) => {
+          if (pKey === col?.key) {
+            ``;
+            obj[col?.label] = handleDataValue(
+              pValue?.includes(",") ? pValue.replaceAll(",", "") : pValue
+            );
+          }
+        });
+      });
+
+      arr.push(obj);
+    }
+
+    const worksheet = XLSX.utils.json_to_sheet(arr);
+
+    const workbook = XLSX.utils.book_new();
+    XLSX.utils.book_append_sheet(workbook, worksheet, "People");
+
+    const excelBuffer = XLSX.write(workbook, {
+      bookType: "xlsx",
+      type: "array",
+    });
+
+    const blob = new Blob([excelBuffer], {
+      type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+    });
+    saveAs(blob, "reports.xls");
+  };
+
+  const fetchExcelData = async () => {
+    setExcelLoading(true);
+    const fetchableColumns = columns.filter((c) => !c.computed);
+    const outputFields = fetchableColumns.map((c) => c.apiField ?? c.key);
+
+    const response = await apiService.select({
+      ProcessName: "project",
+      OutputFields: outputFields,
+      Conditions: [
+        ["start_date", ">=", selectedDate?.start || null, "and"],
+        ["start_date", "<=", selectedDate?.end || null],
+      ],
+    });
+    const parsedData = JSON.parse(response.data);
+    setExcelLoading(false);
+    return parsedData;
+  };
+
+  const handleDownloadFile = () => {
+    if (excelLoading) return null;
+    else exportToExcel();
+  };
 
   return (
     <header
       className={cn(
         "backdrop-blur-sm border-b border-gray-400/30 h-16 flex items-center justify-between px-4 lg:px-6 shadow-sm relative z-30",
-        className,
+        className
       )}
     >
       {/* Left Section */}
@@ -77,16 +425,70 @@ export function Header({
             <PanelLeft />
           )}
           {title.includes("-") ? (
-  <span className="flex items-center gap-1">
+            <div className="flex row  items-center gap-4">
+              <div className="flex items-center gap-1">
                 {title.split("-")[0]}
                 <ChevronLeft className="inline-block w-4 h-4" />
                 {title.split("-")[1]}
-  </span>
+              </div>
+            </div>
           ) : (
             title
           )}
-
         </h1>
+
+        <div ref={calendarRef} className="flex flex-col gap-3 relative">
+          <div
+            onClick={toggleCalendar}
+            className="flex flex-row w-full gap-2 items-center border border-pr-gray p-1.5 rounded-md px-2.5 min-w-64 cursor-pointer hover:bg-pr-gray/50 transition-all duration-300"
+          >
+            <Calendar size={20} />
+            {selectedDate ? (
+              <div className="flex flex-row justify-between w-full min-w-36 font-bold gap-1">
+                <div className="flex flex-row gap-1.5 w-max">
+                  <span className="text-md">از</span>
+                  <span className="text-md">{selectedDate?.sinceMonth}</span>
+                  <span className="text-md">
+                    {handleDataValue(currentYear.since)}
+                  </span>
+                </div>
+                <div className="flex flex-row gap-1.5 w-max">
+                  <span className="text-md">تا</span>
+                  <span className="text-md">{selectedDate?.fromMonth}</span>
+                  <span className="text-md">
+                    {handleDataValue(currentYear.until)}
+                  </span>
+                </div>
+              </div>
+            ) : (
+              "تاریخ مورد نظر خود را انتخاب نمایید"
+            )}
+          </div>
+
+          {openCalendar && (
+            <div className="flex flex-row gap-2.5 absolute top-14 right-[-40px] p-2.5 !pt-3.5 w-80 rounded-3xl overflow-hidden bg-pr-gray border-2 border-[#5F6284]">
+              <CustomCalendar
+                title="از"
+                nextYearHandler={prevFromYearHandler}
+                prevYearHandler={nextFromYearHandler}
+                currentYear={handleDataValue(currentYear?.since)}
+                monthList={monthList}
+                selectedDate={selectedDate?.sinceMonth}
+                selectDateHandler={selectFromDateHandler}
+              />
+              <span className="w-0.5 h-[12.5rem] border border-[#5F6284] block "></span>
+              <CustomCalendar
+                title="تا"
+                nextYearHandler={prevUntilYearHandler}
+                prevYearHandler={nextUntilYearHandler}
+                currentYear={handleDataValue(currentYear?.until)}
+                monthList={monthList}
+                selectedDate={selectedDate?.fromMonth}
+                selectDateHandler={selectUntilDateHandler}
+              />
+            </div>
+          )}
+        </div>
       </div>
 
       {/* Right Section */}
@@ -94,14 +496,29 @@ export function Header({
         {/* User Menu */}
         <div className="relative">
           <div className="flex items-center gap-2">
+            {location.pathname === projectManagerRoute ? (
+              <div className="flex justify-end w-full mb-0 pl-2">
+                <span
+                  className={`flex w-full cursor-pointer items-center gap-2 px-3 py-2 text-sm text-gray-300 hover:bg-gradient-to-r hover:from-emerald-500/10 hover:to-teal-500/10 hover:text-emerald-300 font-persian ${excelLoading ? "!cursor-not-allowed !opacity-10" : ""}`}
+                  onClick={handleDownloadFile}
+                >
+                  <FileChartColumnIncreasing className="h-4 w-4" />
+                  دانلود فایل اکسل
+                </span>
+              </div>
+            ) : (
+              ""
+            )}
 
-            {
+            {user?.id === 2041 && (
-              user?.id === 2041 && <button
+              <button
                 className="flex w-full  cursor-pointer items-center gap-2 px-3 py-2 text-sm text-gray-300 hover:bg-gradient-to-r hover:from-emerald-500/10 hover:to-teal-500/10 hover:text-emerald-300 font-persian"
-                onClick={redirectHandler}>
+                onClick={redirectHandler}
+              >
                 <Server className="h-4 w-4" />
-                ورود به میزکار مدیریت</button>
+                ورود به میزکار مدیریت
-            }
+              </button>
+            )}
 
             <Button
               variant="ghost"
@@ -109,7 +526,6 @@ export function Header({
               onClick={() => setIsProfileMenuOpen(!isProfileMenuOpen)}
               className="flex items-center gap-2 text-gray-300"
             >
-             
               <div className="hidden sm:block text-right">
                 <div className="text-sm font-medium font-persian">
                   {user?.name} {user?.family}
@@ -123,6 +539,7 @@ export function Header({
               </div>
             </Button>
           </div>
+
           {/* Profile Dropdown */}
           {isProfileMenuOpen && (
             <div className="absolute left-0 top-full mt-2 w-48 bg-gray-800 border border-emerald-500/30 rounded-lg shadow-lg z-50">
@@ -134,7 +551,7 @@ export function Header({
                   {user?.email}
                 </div>
               </div>
-              <div className="py-1">
+              {/* <div className="py-1">
                 <Link
                   to="/dashboard/profile"
                   className="flex items-center gap-2 px-3 py-2 text-sm text-gray-300 hover:bg-gradient-to-r hover:from-emerald-500/10 hover:to-teal-500/10 hover:text-emerald-300 font-persian"
@@ -151,7 +568,7 @@ export function Header({
                   <Settings className="h-4 w-4" />
                   تنظیمات
                 </Link> 
-              </div>
+              </div> */}
             </div>
           )}
         </div>

app/components/dashboard/layout.tsx

@@ -1,9 +1,8 @@
 import { useState } from "react";
 import { cn } from "~/lib/utils";
-import { Sidebar } from "./sidebar";
 import { Header } from "./header";
+import { Sidebar } from "./sidebar";
 import { StrategicAlignmentPopup } from "./strategic-alignment-popup";
-import apiService from "~/lib/api";
 
 interface DashboardLayoutProps {
   children: React.ReactNode;
@@ -18,9 +17,14 @@ export function DashboardLayout({
 }: DashboardLayoutProps) {
   const [isSidebarCollapsed, setIsSidebarCollapsed] = useState(false);
   const [isMobileSidebarOpen, setIsMobileSidebarOpen] = useState(false);
-  const [isStrategicAlignmentPopupOpen, setIsStrategicAlignmentPopupOpen] = useState(false);
+  const [isStrategicAlignmentPopupOpen, setIsStrategicAlignmentPopupOpen] =
-  const [currentTitle, setCurrentTitle] = useState<string | undefined>(title ?? "صفحه اول");
+    useState(false);
-  const [currentTitleIcon, setCurrentTitleIcon] = useState<React.ComponentType<{ className?: string }> | null | undefined>(undefined);
+  const [currentTitle, setCurrentTitle] = useState<string | undefined>(
+    title ?? "صفحه اول"
+  );
+  const [currentTitleIcon, setCurrentTitleIcon] = useState<
+    React.ComponentType<{ className?: string }> | null | undefined
+  >(undefined);
 
   const toggleSidebarCollapse = () => {
     setIsSidebarCollapsed(!isSidebarCollapsed);
@@ -30,8 +34,6 @@ export function DashboardLayout({
     setIsMobileSidebarOpen(!isMobileSidebarOpen);
   };
 
-
-
   return (
     <div
       className="h-screen flex overflow-hidden bg-[linear-gradient(to_bottom_left,#464861,20%,#111628)] relative overflow-x-hidden"
@@ -55,19 +57,20 @@ export function DashboardLayout({
           "fixed inset-y-0 right-0 z-50 flex flex-col lg:static lg:inset-auto lg:translate-x-0 transition-transform duration-300 ease-in-out",
           isMobileSidebarOpen
             ? "translate-x-0"
-            : "translate-x-full lg:translate-x-0",
+            : "translate-x-full lg:translate-x-0"
         )}
       >
         <Sidebar
           isCollapsed={isSidebarCollapsed}
           onToggleCollapse={toggleSidebarCollapse}
           className="h-full flex-shrink-0 relative z-10"
-          onStrategicAlignmentClick={() => setIsStrategicAlignmentPopupOpen(true)}
+          onStrategicAlignmentClick={() =>
+            setIsStrategicAlignmentPopupOpen(true)
+          }
           onTitleChange={(info) => {
             setCurrentTitle(info.title);
             setCurrentTitleIcon(info.icon ?? null);
           }}
-
         />
       </div>
 
@@ -85,7 +88,7 @@ export function DashboardLayout({
         <main
           className={cn(
             "flex-1 overflow-x-hidden overflow-y-auto focus:outline-none transition-all duration-300 min-w-0",
-            className,
+            className
           )}
         >
           <div className="relative h-full min-w-0 w-full z-10 overflow-x-hidden p-5">
@@ -93,7 +96,10 @@ export function DashboardLayout({
           </div>
         </main>
       </div>
-      <StrategicAlignmentPopup open={isStrategicAlignmentPopupOpen} onOpenChange={setIsStrategicAlignmentPopupOpen} />
+      <StrategicAlignmentPopup
+        open={isStrategicAlignmentPopupOpen}
+        onOpenChange={setIsStrategicAlignmentPopupOpen}
+      />
     </div>
   );
 }

app/components/dashboard/project-management/digital-innovation-page.tsx

@@ -12,9 +12,10 @@ import {
   Zap,
 } from "lucide-react";
 import moment from "moment-jalaali";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import toast from "react-hot-toast";
 import { Badge } from "~/components/ui/badge";
+import { BaseCard } from "~/components/ui/base-card";
 import { Button } from "~/components/ui/button";
 import { Card, CardContent } from "~/components/ui/card";
 import { Checkbox } from "~/components/ui/checkbox";
@@ -33,8 +34,10 @@ import {
   TableHeader,
   TableRow,
 } from "~/components/ui/table";
+import { useStoredDate } from "~/hooks/useStoredDate";
 import apiService from "~/lib/api";
-import { formatCurrency, formatNumber } from "~/lib/utils";
+import { EventBus, formatCurrency, formatNumber } from "~/lib/utils";
+import type { CalendarDate } from "~/types/util.type";
 import { DashboardLayout } from "../layout";
 
 moment.loadPersian({ usePersianDigits: true });
@@ -152,7 +155,7 @@ export function DigitalInnovationPage() {
   const [currentPage, setCurrentPage] = useState(1);
   const [pageSize] = useState(20);
   const [hasMore, setHasMore] = useState(true);
-  const [totalCount, setTotalCount] = useState(0);
+  const [date, setDate] = useStoredDate();
   const [actualTotalCount, setActualTotalCount] = useState(0);
   const [statsLoading, setStatsLoading] = useState(false);
   const [rating, setRating] = useState<ListItem[]>([]);
@@ -212,7 +215,7 @@ export function DigitalInnovationPage() {
       value: formatNumber(stats.reduceCosts.toFixed?.(1) ?? stats.reduceCosts),
       description: "میلیون ریال کاهش یافته",
       icon: <TrendingDown />,
-      color: "text-emerald-400",
+      color: "text-pr-green",
     },
     {
       id: "bottleneck-removal",
@@ -220,7 +223,7 @@ export function DigitalInnovationPage() {
       value: formatNumber(stats.increasedRevenue),
       description: "میلیون ریال افزایش یافته",
       icon: <TrendingUp />,
-      color: "text-emerald-400",
+      color: "text-pr-green",
     },
 
     {
@@ -231,7 +234,7 @@ export function DigitalInnovationPage() {
       ),
       description: "هزار تن صرفه جوریی شده",
       icon: <Database />,
-      color: "text-emerald-400",
+      color: "text-pr-green",
     },
     {
       id: "frequent-failures-reduction",
@@ -242,7 +245,7 @@ export function DigitalInnovationPage() {
       ),
       description: "مگاوات کاهش یافته",
       icon: <Zap />,
-      color: "text-emerald-400",
+      color: "text-pr-green",
     },
   ];
 
@@ -281,7 +284,11 @@ export function DigitalInnovationPage() {
           "reduce_costs_percent",
         ],
         Sorts: [[sortConfig.field, sortConfig.direction]],
-        Conditions: [["type_of_innovation", "=", "نوآوری دیجیتال"]],
+        Conditions: [
+          ["type_of_innovation", "=", "نوآوری دیجیتال", "and"],
+          ["start_date", ">=", date?.start || null, "and"],
+          ["start_date", "<=", date?.end || null],
+        ],
         Pagination: { PageNumber: pageToFetch, PageSize: pageSize },
       });
 
@@ -294,16 +301,16 @@ export function DigitalInnovationPage() {
               if (reset) {
                 setProjects(parsedData);
                 // calculateAverage(parsedData);
-                setTotalCount(parsedData.length);
+                // setTotalCount(parsedData.length);
               } else {
                 setProjects((prev) => [...prev, ...parsedData]);
-                setTotalCount((prev) => prev + parsedData.length);
+                // setTotalCount((prev) => prev + parsedData.length);
               }
               setHasMore(parsedData.length === pageSize);
             } else {
               if (reset) {
                 setProjects([]);
-                setTotalCount(0);
+                // setTotalCount(0);
               }
               setHasMore(false);
             }
@@ -311,14 +318,14 @@ export function DigitalInnovationPage() {
             console.error("Error parsing project data:", parseError);
             if (reset) {
               setProjects([]);
-              setTotalCount(0);
+              // setTotalCount(0);
             }
             setHasMore(false);
           }
         } else {
           if (reset) {
             setProjects([]);
-            setTotalCount(0);
+            // setTotalCount(0);
           }
           setHasMore(false);
         }
@@ -326,7 +333,7 @@ export function DigitalInnovationPage() {
         toast.error(response.message || "خطا در دریافت اطلاعات پروژه‌ها");
         if (reset) {
           setProjects([]);
-          setTotalCount(0);
+          // setTotalCount(0);
         }
         setHasMore(false);
       }
@@ -335,7 +342,7 @@ export function DigitalInnovationPage() {
       toast.error("خطا در دریافت اطلاعات پروژه‌ها");
       if (reset) {
         setProjects([]);
-        setTotalCount(0);
+        // setTotalCount(0);
       }
       setHasMore(false);
     } finally {
@@ -353,13 +360,27 @@ export function DigitalInnovationPage() {
   }, [hasMore, loading, loadingMore]);
 
   useEffect(() => {
+    if (date?.start && date?.end) {
       fetchTable(true);
       fetchTotalCount();
       fetchStats();
-  }, [sortConfig]);
+    }
+  }, [sortConfig, date]);
 
   useEffect(() => {
-    if (currentPage > 1) {
+    const handler = (date: CalendarDate) => {
+      if (date) setDate(date);
+    };
+
+    EventBus.on("dateSelected", handler);
+
+    return () => {
+      EventBus.off("dateSelected", handler);
+    };
+  }, []);
+
+  useEffect(() => {
+    if (currentPage > 1 && date?.start && date?.end) {
       fetchTable(false);
     }
   }, [currentPage]);
@@ -412,19 +433,23 @@ export function DigitalInnovationPage() {
       direction:
         prev.field === field && prev.direction === "asc" ? "desc" : "asc",
     }));
-    fetchTotalCount();
+    fetchTotalCount(date?.start, date?.end);
     fetchStats();
     setCurrentPage(1);
     setProjects([]);
     setHasMore(true);
   };
 
-  const fetchTotalCount = async () => {
+  const fetchTotalCount = async (startDate?: string, endDate?: string) => {
     try {
       const response = await apiService.select({
         ProcessName: "project",
         OutputFields: ["count(project_no)"],
-        Conditions: [["type_of_innovation", "=", "نوآوری دیجیتال"]],
+        Conditions: [
+          ["type_of_innovation", "=", "نوآوری دیجیتال", "and"],
+          ["start_date", ">=", date?.start || null, "and"],
+          ["start_date", "<=", date?.end || null],
+        ],
       });
 
       if (response.state === 0) {
@@ -451,7 +476,10 @@ export function DigitalInnovationPage() {
     try {
       setStatsLoading(true);
       const raw = await apiService.call<any>({
-        innovation_digital_function: {},
+        innovation_digital_function: {
+          start_date: date?.start || null,
+          end_date: date?.end || null,
+        },
       });
 
       // let payload: DigitalInnovationMetrics = raw?.data;
@@ -529,33 +557,33 @@ export function DigitalInnovationPage() {
   //   fetchStats();
   // };
 
-  const renderProgress = useMemo(() => {
+  // const renderProgress = useMemo(() => {
-    const total = 10;
+  //   const total = 10;
-    for (let i = 0; i < rating.length; i++) {
+  //   for (let i = 0; i < rating.length; i++) {
-      const currentElm = rating[i];
+  //     const currentElm = rating[i];
-      currentElm.house = [];
+  //     currentElm.house = [];
-      const greenBoxes = Math.floor((total * currentElm.development) / 100);
+  //     const greenBoxes = Math.floor((total * currentElm.development) / 100);
-      const partialPercent =
+  //     const partialPercent =
-        (total * currentElm.development) / 100 - greenBoxes;
+  //       (total * currentElm.development) / 100 - greenBoxes;
-      for (let j = 0; j < greenBoxes; j++) {
+  //     for (let j = 0; j < greenBoxes; j++) {
-        currentElm.house.push({
+  //       currentElm.house.push({
-          index: j,
+  //         index: j,
-          color: "!bg-emerald-400",
+  //         color: "!bg-emerald-400",
-        });
+  //       });
-      }
+  //     }
-      if (partialPercent != 0 && greenBoxes != 10)
+  //     if (partialPercent != 0 && greenBoxes != 10)
-        currentElm.house.push({
+  //       currentElm.house.push({
-          index: greenBoxes + 1,
+  //         index: greenBoxes + 1,
-          style: `linear-gradient(
+  //         style: `linear-gradient(
-            to right,
+  //           to right,
-            oklch(76.5% 0.177 163.223) 0%,
+  //           oklch(76.5% 0.177 163.223) 0%,
-            oklch(76.5% 0.177 163.223) ${partialPercent * 100}%,
+  //           oklch(76.5% 0.177 163.223) ${partialPercent * 100}%,
-            oklch(55.1% 0.027 264.364) ${partialPercent * 100}%,
+  //           oklch(55.1% 0.027 264.364) ${partialPercent * 100}%,
-            oklch(55.1% 0.027 264.364) 100%
+  //           oklch(55.1% 0.027 264.364) 100%
-          )`,
+  //         )`,
-        });
+  //       });
-    }
+  //   }
-  }, [rating]);
+  // }, [rating]);
 
   const statusColor = (status: projectStatus): any => {
     let el = null;
@@ -599,14 +627,14 @@ export function DigitalInnovationPage() {
             variant="ghost"
             size="sm"
             onClick={() => handleProjectDetails(item)}
-            className="text-pr-green hover:text-emerald-300 underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto"
+            className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto"
           >
             جزئیات بیشتر
           </Button>
         );
       case "amount_currency_reduction":
         return (
-          <span className="font-medium text-emerald-400">
+          <span className="font-medium text-pr-green">
             {formatCurrency(String(value))}
           </span>
         );
@@ -617,7 +645,9 @@ export function DigitalInnovationPage() {
           </Badge>
         );
       case "title":
-        return <span className="font-medium text-white">{String(value)}</span>;
+        return (
+          <span className="font-light text-sm text-white">{String(value)}</span>
+        );
       case "project_status":
         return (
           <div className="flex items-center gap-1">
@@ -652,7 +682,7 @@ export function DigitalInnovationPage() {
 
   return (
     <DashboardLayout title="نوآوری دیجیتال">
-      <div className="space-y-4 grid  justify-between gap-8 pl-6 sm:grid-cols-1 xl:grid-cols-[40%_60%]">
+      <div className="space-y-4 grid  justify-between gap-7 pl-6 sm:grid-cols-1 xl:grid-cols-[40%_60%]">
         {/* Stats Cards */}
         <div className="flex flex-col gap-6  w-full mb-0">
           <div className="space-y-6 w-full">
@@ -725,50 +755,49 @@ export function DigitalInnovationPage() {
           </div>
 
           {/* Process Impacts Chart */}
-          <Card className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)]  backdrop-blur-sm rounded-lg w-full overflow-hidden h-full ">
+          <BaseCard className="rounded-xl w-full overflow-hidden">
             {/* <CardContent > */}
             <CustomBarChart
               title="تاثیرات نوآوری دیجیتال به صورت درصد مقایسه ای"
               loading={statsLoading}
-              height="100%"
+              // height="100%"
               data={[
                 {
                   label: DigitalCardLabel.decreasCost,
                   value: stats.reduceCostsPercent || 0,
-                  color: "bg-emerald-400",
+                  color: "bg-pr-green",
                   labelColor: "text-white",
                 },
                 {
                   label: DigitalCardLabel.increaseRevenue,
                   value: stats.increasedRevenuePercent || 0,
-                  color: "bg-emerald-400",
+                  color: "bg-pr-green",
                   labelColor: "text-white",
                 },
                 {
                   label: DigitalCardLabel.performance,
                   value: stats.resourceProductivityPercent || 0,
-                  color: "bg-emerald-400",
+                  color: "bg-pr-green",
                   labelColor: "text-white",
                 },
                 {
                   label: DigitalCardLabel.decreaseEnergy,
                   value: stats.reduceEnergyConsumptionPercent || 0,
-                  color: "bg-emerald-400",
+                  color: "bg-pr-green",
                   labelColor: "text-white",
                 },
               ]}
               barHeight="h-5"
               showAxisLabels={true}
             />
-            {/* </CardContent> */}
+          </BaseCard>
-          </Card>
         </div>
 
         {/* Data Table */}
-        <Card className="bg-transparent backdrop-blur-sm rounded-lg overflow-hidden w-full h-[39.7rem]">
+        <Card className="bg-transparent backdrop-blur-sm rounded-lg overflow-hidden w-full h-max">
           <CardContent className="p-0">
             <div className="relative h-full">
-              <Table containerClassName="overflow-auto custom-scrollbar w-full h-[36.8rem] ">
+              <Table containerClassName="overflow-auto custom-scrollbar w-full h-[calc(100vh-160px)] ">
                 <TableHeader>
                   <TableRow className="bg-[#3F415A]">
                     {columns.map((column) => (
@@ -947,7 +976,7 @@ export function DigitalInnovationPage() {
 
       {/* Project Details Dialog */}
       <Dialog open={detailsDialogOpen} onOpenChange={setDetailsDialogOpen}>
-        <DialogContent className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] max-w-5xl max-h-[80vh] overflow-y-auto">
+        <DialogContent className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] max-w-6xl max-h-[80vh] overflow-y-auto">
           <DialogHeader>
             <DialogTitle className="text-white mr-4 border-b-2 border-gray-600 pb-4 font-persian text-right">
               شرح پروژه
@@ -1005,7 +1034,7 @@ export function DigitalInnovationPage() {
             </div>
             <div className="digitalAbilityDevelopment flex flex-col gap-10 border-l-2 border-l-gray-600 px-5">
               <div className="flex flex-col gap-4">
-                <span className="text-md font-bold">
+                <span className="text-lg font-bold">
                   توسعه قابلیت های دیجیتال:{" "}
                 </span>
                 <div className="flex flex-col gap-2">
@@ -1071,7 +1100,7 @@ export function DigitalInnovationPage() {
             <div className="flex flex-col px-6 gap-4">
               <div className="costBoard mx-auto w-full">
                 <div className="board o border border-gray-600 rounded-xl overflow-hidden flex flex-col">
-                  <span className="title bg-[#3F415A]  text-white w-full p-2.5 pr-4 ">
+                  <span className="text-sm bg-[#3F415A]  text-white w-full p-2.5 pr-4 ">
                     کاهش هزینه ها
                   </span>
 

app/components/dashboard/project-management/green-innovation-page.tsx

@@ -1,4 +1,3 @@
-// import moment from "moment-jalaali";
 import { useCallback, useEffect, useRef, useState } from "react";
 import {
   Bar,
@@ -26,7 +25,7 @@ import {
   TableHeader,
   TableRow,
 } from "~/components/ui/table";
-import { formatNumber } from "~/lib/utils";
+import { EventBus, formatNumber } from "~/lib/utils";
 
 import {
   Building2,
@@ -43,12 +42,17 @@ import {
   UsersIcon,
   Zap,
 } from "lucide-react";
+import moment from "moment-jalaali";
 import toast from "react-hot-toast";
+import { MetricCard } from "~/components/ui/metric-card";
+import { useStoredDate } from "~/hooks/useStoredDate";
 import apiService from "~/lib/api";
 import { formatCurrency } from "~/lib/utils";
+import type { CalendarDate } from "~/types/util.type";
 import DashboardLayout from "../layout";
 
-// moment.loadPersian({ usePersianDigits: true });
+moment.loadPersian({ usePersianDigits: true });
+
 interface GreenInnovationData {
   WorkflowID: string;
   approved_budget: string;
@@ -166,6 +170,8 @@ export function GreenInnovationPage() {
   const [totalCount, setTotalCount] = useState(0);
   const [actualTotalCount, setActualTotalCount] = useState(0);
   const [statsLoading, setStatsLoading] = useState(false);
+  const [date, setDate] = useStoredDate();
+
   const [stats, setStats] = useState<stateCounter>();
   const [sortConfig, setSortConfig] = useState<SortConfig>({
     field: "start_date",
@@ -288,7 +294,11 @@ export function GreenInnovationPage() {
           "observer",
         ],
         Sorts: [[sortConfig.field, sortConfig.direction]],
-        Conditions: [["type_of_innovation", "=", "نوآوری سبز"]],
+        Conditions: [
+          ["type_of_innovation", "=", "نوآوری سبز", "and"],
+          ["start_date", ">=", date?.start || null, "and"],
+          ["start_date", "<=", date?.end || null],
+        ],
         Pagination: { PageNumber: pageToFetch, PageSize: pageSize },
       });
       if (response.state === 0) {
@@ -350,6 +360,18 @@ export function GreenInnovationPage() {
     }
   };
 
+  useEffect(() => {
+    const handler = (date: CalendarDate) => {
+      if (date) setDate(date);
+    };
+
+    EventBus.on("dateSelected", handler);
+
+    return () => {
+      EventBus.off("dateSelected", handler);
+    };
+  }, []);
+
   const loadMore = useCallback(() => {
     if (hasMore && !loading) {
       setCurrentPage((prev) => prev + 1);
@@ -357,13 +379,15 @@ export function GreenInnovationPage() {
   }, [hasMore, loading]);
 
   useEffect(() => {
+    if (date.end && date.start) {
       fetchProjects(true);
       fetchTotalCount();
-  }, [sortConfig]);
+    }
+  }, [sortConfig, date]);
 
   useEffect(() => {
-    fetchStats();
+    if (date.end && date.start) fetchStats();
-  }, [selectedProjects]);
+  }, [selectedProjects, date]);
 
   useEffect(() => {
     if (currentPage > 1) {
@@ -416,7 +440,11 @@ export function GreenInnovationPage() {
       const response = await apiService.select({
         ProcessName: "project",
         OutputFields: ["count(project_no)"],
-        Conditions: [["type_of_innovation", "=", "نوآوری سبز"]],
+        Conditions: [
+          ["type_of_innovation", "=", "نوآوری سبز", "and"],
+          ["start_date", ">=", date?.start || null, "and"],
+          ["start_date", "<=", date?.end || null],
+        ],
       });
       if (response.state === 0) {
         const dataString = response.data;
@@ -448,6 +476,8 @@ export function GreenInnovationPage() {
             selectedProjects.size > 0
               ? Array.from(selectedProjects).join(" , ")
               : "",
+          start_date: date?.start || null,
+          end_date: date?.end || null,
         },
       });
       let payload: any = raw?.data;
@@ -494,13 +524,13 @@ export function GreenInnovationPage() {
         },
 
         pollution: {
-          value: formatNumber(parseNum(stats.pollution_reduction)),
+          value: parseNum(stats.pollution_reduction),
-          percent: formatNumber(parseNum(stats.pollution_reduction_percent)),
+          percent: parseNum(stats.pollution_reduction_percent),
         },
 
         waste: {
-          value: formatNumber(parseNum(stats.waste_reduction)),
+          value: parseNum(stats.waste_reduction),
-          percent: formatNumber(parseNum(stats.waste_reductionn_percent)),
+          percent: parseNum(stats.waste_reductionn_percent),
         },
         avarage: stats.average_project_score,
         countInnovationGreenProjects: stats.count_innovation_green_projects,
@@ -518,7 +548,6 @@ export function GreenInnovationPage() {
       setStatsLoading(false);
     }
   };
-
   const setPageData = (normalized: any) => {
     setSustainabilityStats((prev) => ({
       ...prev,
@@ -602,14 +631,14 @@ export function GreenInnovationPage() {
             variant="ghost"
             size="sm"
             onClick={() => handleProjectDetails(item)}
-            className="text-pr-green hover:text-emerald-300 underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto"
+            className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto"
           >
             جزئیات بیشتر
           </Button>
         );
       case "amount_currency_reduction":
         return (
-          <span className="font-medium text-emerald-400">
+          <span className="font-medium text-pr-green">
             {formatCurrency(String(value))}
           </span>
         );
@@ -620,7 +649,9 @@ export function GreenInnovationPage() {
           </Badge>
         );
       case "title":
-        return <span className="font-medium text-white">{String(value)}</span>;
+        return (
+          <span className="font-light text-sm text-white">{String(value)}</span>
+        );
       case "project_status":
         return (
           <div className="flex items-center gap-1">
@@ -720,39 +751,14 @@ export function GreenInnovationPage() {
                   </Card>
                 ))
               : Object.entries(sustainabilityStats).map(([key, value]) => (
-                  <Card
+                  <MetricCard
                     key={key}
-                    className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] rounded-lg backdrop-blur-sm border-gray-700/50"
+                    title={value.title}
-                  >
+                    value={Math.round(value.total.value || 0)}
-                    <CardContent className="p-0 h-full">
+                    valueLabel={value.total?.description}
-                      <div className="flex flex-col justify-between gap-2 h-full">
+                    percentValue={value.percent?.value || 0}
-                        <div className="flex justify-between items-center border-b-2 border-gray-500/20 ">
+                    percentLabel={value.percent?.description}
-                          <h3 className="text-lg font-bold text-white font-persian p-4">
+                  />
-                            {value.title}
-                          </h3>
-                        </div>
-                        <div className="flex items-center justify-between p-6 flex-row-reverse">
-                          <div className="flex flex-col">
-                            <span className="text-3xl font-bold text-emerald-400 mb-1 font-persian">
-                              % {value.percent?.value}
-                            </span>
-                            <span className="text-sm text-gray-400 font-persian">
-                              {value.percent?.description}
-                            </span>
-                          </div>
-                          <b className="block w-0.5 h-8 bg-gray-600 rotate-45" />
-                          <div className="flex flex-col">
-                            <span className="text-3xl font-bold text-emerald-400 mb-1 font-persian">
-                              {value.total?.value}
-                            </span>
-                            <span className="text-sm text-gray-400 font-persian">
-                              {value.total?.description}
-                            </span>
-                          </div>
-                        </div>
-                      </div>
-                    </CardContent>
-                  </Card>
                 ))}
           </div>
 
@@ -898,7 +904,7 @@ export function GreenInnovationPage() {
             </Card>
           )}
 
-          <Card className="w-1/3 bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)]  backdrop-blur-sm rounded-lg overflow-hidden">
+          <Card className="w-1/2 bg-pr-gray  backdrop-blur-sm rounded-lg overflow-hidden">
             <CardContent className="p-0">
               <div className="border-b-2 border-gray-500/20">
                 <div className="flex flex-row justify-between w-full p-4">
@@ -949,7 +955,7 @@ export function GreenInnovationPage() {
         <Card className="bg-transparent backdrop-blur-sm rounded-lg overflow-hidden">
           <CardContent className="p-0">
             <div className="relative">
-              <Table containerClassName="overflow-auto custom-scrollbar h-[25rem]">
+              <Table containerClassName="overflow-auto custom-scrollbar h-full">
                 <TableHeader>
                   <TableRow className="bg-[#3F415A]">
                     {columns.map((column) => (
@@ -1113,7 +1119,7 @@ export function GreenInnovationPage() {
               شرح پروژه
             </DialogTitle>
           </DialogHeader>
-          <div className="space-y-4 flex justify-between text-right px-6">
+          <div className="space-y-4 flex justify-between text-right p-6">
             {/* Project Description */}
             <div className="flex-[4] border-l-2 border-gray-600">
               <h2 className="font-bold">{selectedProjectDetails?.title}</h2>

app/components/dashboard/project-management/innovation-built-inside-page.tsx

@@ -39,8 +39,11 @@ import {
   ResponsiveContainer,
   XAxis,
 } from "recharts";
+import { MetricCard } from "~/components/ui/metric-card";
+import { useStoredDate } from "~/hooks/useStoredDate";
 import apiService from "~/lib/api";
-import { formatCurrency, formatNumber } from "~/lib/utils";
+import { EventBus, formatCurrency, formatNumber } from "~/lib/utils";
+import type { CalendarDate } from "~/types/util.type";
 import DashboardLayout from "../layout";
 
 interface innovationBuiltInDate {
@@ -152,8 +155,8 @@ enum projectStatus {
 
 const columns = [
   { key: "select", label: "", sortable: false, width: "50px" },
-  { key: "project_no", label: "شماره پروژه", sortable: true, width: "140px" },
+  { key: "project_no", label: "شماره پروژه", sortable: true, width: "120px" },
-  { key: "title", label: "عنوان پروژه", sortable: true, width: "400px" },
+  { key: "title", label: "عنوان پروژه", sortable: true, width: "300px" },
   {
     key: "project_status",
     label: "وضعیت پروژه",
@@ -164,7 +167,7 @@ const columns = [
     key: "project_rating",
     label: "امتیاز پروژه",
     sortable: true,
-    width: "140px",
+    width: "120px",
   },
   { key: "details", label: "جزئیات پروژه", sortable: false, width: "140px" },
 ];
@@ -191,6 +194,8 @@ export function InnovationBuiltInsidePage() {
     field: "start_date",
     direction: "asc",
   });
+
+  const [date, setDate] = useStoredDate();
   const [tblAvarage, setTblAvarage] = useState<number>(0);
   const [selectedProjects, setSelectedProjects] =
     useState<Set<string | number>>();
@@ -310,7 +315,11 @@ export function InnovationBuiltInsidePage() {
           "technology_maturity_level",
         ],
         Sorts: [[sortConfig.field, sortConfig.direction]],
-        Conditions: [["type_of_innovation", "=", "نوآوری ساخت داخل"]],
+        Conditions: [
+          ["type_of_innovation", "=", "نوآوری ساخت داخل", "and"],
+          ["start_date", ">=", date?.start || null, "and"],
+          ["start_date", "<=", date?.end || null],
+        ],
         Pagination: { PageNumber: pageToFetch, PageSize: pageSize },
       });
       if (response.state === 0) {
@@ -417,12 +426,24 @@ export function InnovationBuiltInsidePage() {
   }, [hasMore, loading]);
 
   useEffect(() => {
-    fetchProjects(true);
+    const handler = (date: CalendarDate) => {
-  }, [sortConfig]);
+      if (date) setDate(date);
+    };
+
+    EventBus.on("dateSelected", handler);
+
+    return () => {
+      EventBus.off("dateSelected", handler);
+    };
+  }, []);
 
   useEffect(() => {
-    fetchStats();
+    if (date.start && date.end) fetchProjects(true);
-  }, [selectedProjects]);
+  }, [sortConfig, date]);
+
+  useEffect(() => {
+    if (date.end && date.start) fetchStats();
+  }, [selectedProjects, date]);
 
   useEffect(() => {
     if (currentPage > 1) {
@@ -480,6 +501,8 @@ export function InnovationBuiltInsidePage() {
             selectedProjects && selectedProjects?.size > 0
               ? Array.from(selectedProjects).join(" , ")
               : "",
+          start_date: date?.start || null,
+          end_date: date?.end || null,
         },
       });
       let payload: any = raw?.data;
@@ -505,15 +528,13 @@ export function InnovationBuiltInsidePage() {
       const stats = data[0];
       const normalized: any = {
         currencySaving: {
-          value: formatNumber(parseNum(stats?.foreign_currency_saving)),
+          value: parseNum(stats?.foreign_currency_saving),
-          percent: formatNumber(
+          percent: parseNum(stats?.foreign_currency_saving_percent),
-            parseNum(stats?.foreign_currency_saving_percent)
-          ),
         },
 
         investmentAmount: {
-          value: formatNumber(parseNum(stats?.investment_amount)),
+          value: parseNum(stats?.investment_amount),
-          percent: formatNumber(parseNum(stats?.investment_amount_percent)),
+          percent: parseNum(stats?.investment_amount_percent),
         },
 
         technology: {
@@ -624,14 +645,14 @@ export function InnovationBuiltInsidePage() {
             variant="ghost"
             size="sm"
             onClick={() => handleProjectDetails(item)}
-            className="text-pr-green hover:text-emerald-300 underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto"
+            className="text-pr-green hover:text-pr-green underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto"
           >
             جزئیات بیشتر
           </Button>
         );
       case "amount_currency_reduction":
         return (
-          <span className="font-medium text-emerald-500">
+          <span className="font-medium text-pr-green">
             {formatCurrency(String(value))}
           </span>
         );
@@ -642,7 +663,9 @@ export function InnovationBuiltInsidePage() {
           </Badge>
         );
       case "title":
-        return <span className="font-medium text-white">{String(value)}</span>;
+        return (
+          <span className="font-light text-sm text-white">{String(value)}</span>
+        );
       case "project_status":
         return (
           <div className="flex items-center gap-1">
@@ -701,10 +724,10 @@ export function InnovationBuiltInsidePage() {
 
   return (
     <DashboardLayout title="نوآوری ساخت داخل">
-      <div className="space-y-4   justify-between gap-8 grid pl-3.5 sm:grid-cols-1 xl:grid-cols-[40%_60%]">
+      <div className="space-y-4  justify-between gap-8 grid pl-6 sm:grid-cols-1 xl:grid-cols-[35%_65%]">
         {/* Stats Cards */}
-        <div className="flex gap-6 w-full mb-0">
+        <div className="flex w-full mb-0">
-          <div className="flex flex-col justify-between w-full gap-6">
+          <div className="flex flex-col  w-full justify-between gap-2">
             {statsLoading
               ? // Loading skeleton for stats cards - matching new design
                 Array.from({ length: 2 }).map((_, index) => (
@@ -735,39 +758,47 @@ export function InnovationBuiltInsidePage() {
                   </Card>
                 ))
               : Object.entries(sustainabilityStats).map(([key, value]) => (
-                  <Card
+                  <MetricCard
                     key={key}
-                    className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] rounded-lg backdrop-blur-sm border-gray-700/50"
+                    title={value.title}
-                  >
+                    value={Math.round(value.total.value || 0)}
-                    <CardContent className="p-0 h-full">
+                    valueLabel={value.total?.description}
-                      <div className="flex flex-col justify-between gap-2 h-full">
+                    percentValue={value.percent?.value || 0}
-                        <div className="flex justify-between items-center border-b-2 border-gray-500/20 ">
+                    percentLabel={value.percent?.description}
-                          <h3 className="text-lg font-semibold text-white  p-4">
+                  />
-                            {value.title}
+                  // <Card
-                          </h3>
+                  //   key={key}
-                        </div>
+                  //   className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] rounded-lg backdrop-blur-sm border-gray-700/50"
-                        <div className="flex items-center justify-between p-6 flex-row-reverse">
+                  // >
-                          <div className="flex flex-col">
+                  //   <CardContent className="p-0 h-full">
-                            <span className="text-3xl font-bold text-emerald-500 mb-1 font-persian">
+                  //     <div className="flex flex-col justify-between gap-2 h-full">
-                              % {value.percent?.value}
+                  //       <div className="flex justify-between items-center border-b-2 border-gray-500/20 ">
-                            </span>
+                  //         <h3 className="text-lg font-semibold text-white  p-4">
-                            <span className="text-sm text-gray-400 font-persian">
+                  //           {value.title}
-                              {value.percent?.description}
+                  //         </h3>
-                            </span>
+                  //       </div>
-                          </div>
+                  //       <div className="flex items-center justify-between p-6 flex-row-reverse">
-                          <b className="block w-0.5 h-8 bg-gray-600 rotate-45" />
+                  //         <div className="flex flex-col">
-                          <div className="flex flex-col">
+                  //           <span className="text-3xl font-bold text-pr-green mb-1 font-persian">
-                            <span className="text-3xl font-bold text-emerald-500 mb-1 font-persian">
+                  //             % {value.percent?.value}
-                              {value.total?.value}
+                  //           </span>
-                            </span>
+                  //           <span className="text-sm text-gray-400 font-persian">
-                            <span className="text-sm text-gray-400 font-persian">
+                  //             {value.percent?.description}
-                              {value.total?.description}
+                  //           </span>
-                            </span>
+                  //         </div>
-                          </div>
+                  //         <b className="block w-0.5 h-8 bg-gray-600 rotate-45" />
-                        </div>
+                  //         <div className="flex flex-col">
-                      </div>
+                  //           <span className="text-3xl font-bold text-pr-green mb-1 font-persian">
-                    </CardContent>
+                  //             {value.total?.value}
-                  </Card>
+                  //           </span>
+                  //           <span className="text-sm text-gray-400 font-persian">
+                  //             {value.total?.description}
+                  //           </span>
+                  //         </div>
+                  //       </div>
+                  //     </div>
+                  //   </CardContent>
+                  // </Card>
                 ))}
 
             {statsLoading ? (
@@ -867,7 +898,7 @@ export function InnovationBuiltInsidePage() {
         <Card className="bg-transparent backdrop-blur-sm rounded-lg overflow-hidden w-full h-max">
           <CardContent className="p-0">
             <div className="relative ">
-              <Table containerClassName="overflow-auto custom-scrollbar h-[calc(90vh-15px)]">
+              <Table containerClassName="overflow-auto custom-scrollbar h-[calc(100vh-160px)]">
                 <TableHeader>
                   <TableRow className="bg-[#3F415A]">
                     {columns.map((column) => (
@@ -1030,7 +1061,7 @@ export function InnovationBuiltInsidePage() {
 
       {/* Project Details Dialog */}
       <Dialog open={detailsDialogOpen} onOpenChange={setDetailsDialogOpen}>
-        <DialogContent className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)]  max-w-6xl  overflow-y-auto">
+        <DialogContent className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)]  max-w-5xl  overflow-y-auto">
           <DialogHeader>
             <DialogTitle className="text-white mr-4 border-b-2 border-gray-600 pb-4 font-persian text-right">
               شرح پروژه
@@ -1092,7 +1123,6 @@ export function InnovationBuiltInsidePage() {
                       <div className="flex flex-col  justify-center items-center">
                         <span className="block w-0.5 h-14 bg-white"></span>
                         <span className="text-white border border-white p-1 px-2 text-xs rounded-lg">
-                          {" "}
                           سطح تکنولوژی
                         </span>
                       </div>
@@ -1256,7 +1286,7 @@ export function InnovationBuiltInsidePage() {
                     ))}
                   </div>
                 ) : (
-                  <ResponsiveContainer width="100%" height={420}>
+                  <ResponsiveContainer width="100%" height={400}>
                     <LineChart
                       data={dialogChartData}
                       margin={{ top: 20, right: 70, left: 30, bottom: 80 }}

app/components/dashboard/project-management/process-innovation-page.tsx

@@ -34,8 +34,10 @@ import {
   TableHeader,
   TableRow,
 } from "~/components/ui/table";
+import { useStoredDate } from "~/hooks/useStoredDate";
 import apiService from "~/lib/api";
-import { formatNumber } from "~/lib/utils";
+import { EventBus, formatNumber } from "~/lib/utils";
+import type { CalendarDate } from "~/types/util.type";
 import { DashboardLayout } from "../layout";
 
 moment.loadPersian({ usePersianDigits: true });
@@ -65,9 +67,11 @@ interface ProjectStats {
   percent_reduction_value_currency: string;
   percent_sum_stopping_production: string;
   percent_throat_removal: string;
+  percent_operating_cost_before_innovation: string;
   sum_reducing_breakdowns: number;
   sum_reduction_value_currency: number;
   sum_stopping_production: number;
+  sum_operating_cost_reduction: number;
 }
 
 interface SortConfig {
@@ -92,9 +96,11 @@ interface InnovationStats {
   currencyReductionSum: number; // مجموع کاهش ارز بری (میلیون ریال)
   frequentFailuresReductionSum: number; // مجموع کاهش خرابی های پرتکرار
   percentProductionStops: number | string; // درصد مقایسه‌ای جلوگیری از توقفات تولید
+  reductionCostOprationSum: number; // مجموع کاهش هزینه عملیاتی
   percentBottleneckRemoval: number | string; // درصد مقایسه‌ای رفع گلوگاه
   percentCurrencyReduction: number | string; // درصد مقایسه‌ای کاهش ارز بری
   percentFailuresReduction: number | string; // درصد مقایسه‌ای کاهش خرابی‌های پرتکرار
+  percentOperatingCostBeforeInnovation: number | string; // درصد مقایسه‌ای کاهش هزینه عملیاتی
 }
 
 const columns = [
@@ -123,13 +129,14 @@ export function ProcessInnovationPage() {
   const [currentPage, setCurrentPage] = useState(1);
   const [pageSize] = useState(20);
   const [hasMore, setHasMore] = useState(true);
-  const [totalCount, setTotalCount] = useState(0);
+  const [date, setDate] = useStoredDate();
   const [actualTotalCount, setActualTotalCount] = useState(0);
   const [statsLoading, setStatsLoading] = useState(false);
   const [stats, setStats] = useState<InnovationStats>({
     totalProjects: 0,
     averageScore: 0,
     productionStopsPreventionSum: 0,
+    reductionCostOprationSum: 0,
     bottleneckRemovalCount: 0,
     currencyReductionSum: 0,
     frequentFailuresReductionSum: 0,
@@ -137,6 +144,7 @@ export function ProcessInnovationPage() {
     percentBottleneckRemoval: 0,
     percentCurrencyReduction: 0,
     percentFailuresReduction: 0,
+    percentOperatingCostBeforeInnovation: 0,
   });
   const [sortConfig, setSortConfig] = useState<SortConfig>({
     field: "start_date",
@@ -152,58 +160,60 @@ export function ProcessInnovationPage() {
   const [stateCard, setStateCard] = useState({
     productionstopsprevention: {
       id: "productionstopsprevention",
-      title: "جلوگیری از توقفات تولید",
+      title: "توقفات تولید",
       value: formatNumber(
         stats.productionStopsPreventionSum.toFixed?.(1) ??
           stats.productionStopsPreventionSum
       ),
       description: "تن افزایش یافته",
       icon: CirclePause,
-      color: "text-emerald-400",
+      color: "text-pr-green",
     },
     bottleneckremoval: {
       id: "bottleneckremoval",
-      title: "رفع گلوگاه",
+      title: "گلوگاه ها",
       value: formatNumber(stats.bottleneckRemovalCount),
       description: "تعداد رفع گلوگاه",
       icon: Funnel,
-      color: "text-emerald-400",
+      color: "text-pr-green",
     },
     currencyreduction: {
       id: "currencyreduction",
-      title: "کاهش ارز بری",
+      title: "ارز بری",
       value: formatNumber(
         stats.currencyReductionSum.toFixed?.(0) ?? stats.currencyReductionSum
       ),
       description: "دلار کاهش یافته",
       icon: DollarSign,
-      color: "text-emerald-400",
+      color: "text-pr-green",
+    },
+    decreaseCurrencyOperation: {
+      id: "decreaseCurrencyOperation",
+      title: "هزینه های عملیاتی",
+      value: formatNumber(
+        stats.reductionCostOprationSum.toFixed?.(0) ??
+          stats.reductionCostOprationSum
+      ),
+      description: "میلیون ریال کاهش یافته",
+      icon: DollarSign,
+      color: "text-pr-green",
     },
     frequentfailuresreduction: {
       id: "frequentfailuresreduction",
-      title: "کاهش خرابی های پرتکرار",
+      title: "خرابی های پرتکرار",
       value: formatNumber(
         stats.frequentFailuresReductionSum.toFixed?.(1) ??
           stats.frequentFailuresReductionSum
       ),
-      description: "مجموع درصد کاهش خرابی",
+      description: "خرابی پر تکرار کاهش یافته",
       icon: Wrench,
-      color: "text-emerald-400",
+      color: "text-pr-green",
     },
   });
 
   const observerRef = useRef<HTMLDivElement>(null);
   const fetchingRef = useRef(false);
 
-  // Selection handlers
-  const handleSelectAll = () => {
-    if (selectedProjects.size === projects.length) {
-      setSelectedProjects(new Set());
-    } else {
-      setSelectedProjects(new Set(projects.map((p) => p.project_no)));
-    }
-  };
-
   const handleSelectProject = (projectNo: string) => {
     const newSelected = new Set(selectedProjects);
     if (newSelected.has(projectNo)) {
@@ -256,7 +266,11 @@ export function ProcessInnovationPage() {
           "observer",
         ],
         Sorts: [["start_date", "asc"]],
-        Conditions: [["type_of_innovation", "=", "نوآوری در فرآیند"]],
+        Conditions: [
+          ["type_of_innovation", "=", "نوآوری در فرآیند", "and"],
+          ["start_date", ">=", date?.start || null, "and"],
+          ["start_date", "<=", date?.end || null],
+        ],
         Pagination: { PageNumber: pageToFetch, PageSize: pageSize },
       });
 
@@ -268,16 +282,16 @@ export function ProcessInnovationPage() {
             if (Array.isArray(parsedData)) {
               if (reset) {
                 setProjects(parsedData);
-                setTotalCount(parsedData.length);
+                // setTotalCount(parsedData.length);
               } else {
                 setProjects((prev) => [...prev, ...parsedData]);
-                setTotalCount((prev) => prev + parsedData.length);
+                // setTotalCount((prev) => prev + parsedData.length);
               }
               setHasMore(parsedData.length === pageSize);
             } else {
               if (reset) {
                 setProjects([]);
-                setTotalCount(0);
+                // setTotalCount(0);
               }
               setHasMore(false);
             }
@@ -285,14 +299,14 @@ export function ProcessInnovationPage() {
             console.error("Error parsing project data:", parseError);
             if (reset) {
               setProjects([]);
-              setTotalCount(0);
+              // setTotalCount(0);
             }
             setHasMore(false);
           }
         } else {
           if (reset) {
             setProjects([]);
-            setTotalCount(0);
+            // setTotalCount(0);
           }
           setHasMore(false);
         }
@@ -300,7 +314,7 @@ export function ProcessInnovationPage() {
         toast.error(response.message || "خطا در دریافت اطلاعات پروژه‌ها");
         if (reset) {
           setProjects([]);
-          setTotalCount(0);
+          // setTotalCount(0);
         }
         setHasMore(false);
       }
@@ -309,7 +323,7 @@ export function ProcessInnovationPage() {
       toast.error("خطا در دریافت اطلاعات پروژه‌ها");
       if (reset) {
         setProjects([]);
-        setTotalCount(0);
+        // setTotalCount(0);
       }
       setHasMore(false);
     } finally {
@@ -326,13 +340,27 @@ export function ProcessInnovationPage() {
   }, [hasMore, loading]);
 
   useEffect(() => {
-    fetchProjects(true);
+    const handler = (date: CalendarDate) => {
-    fetchTotalCount();
+      if (date) setDate(date);
-  }, [sortConfig]);
+    };
+
+    EventBus.on("dateSelected", handler);
+
+    return () => {
+      EventBus.off("dateSelected", handler);
+    };
+  }, []);
 
   useEffect(() => {
-    fetchStats();
+    if (date?.start && date?.end) {
-  }, [selectedProjects]);
+      fetchProjects(true);
+      fetchTotalCount();
+    }
+  }, [sortConfig, date]);
+
+  useEffect(() => {
+    if (date?.start && date?.end) fetchStats();
+  }, [selectedProjects, date]);
 
   useEffect(() => {
     if (currentPage > 1) {
@@ -382,7 +410,11 @@ export function ProcessInnovationPage() {
       const response = await apiService.select({
         ProcessName: "project",
         OutputFields: ["count(project_no)"],
-        Conditions: [["type_of_innovation", "=", "نوآوری در فرآیند"]],
+        Conditions: [
+          ["type_of_innovation", "=", "نوآوری در فرآیند", "and"],
+          ["start_date", ">=", date?.start || null, "and"],
+          ["start_date", "<=", date?.end || null],
+        ],
       });
 
       if (response.state === 0) {
@@ -416,6 +448,8 @@ export function ProcessInnovationPage() {
             selectedProjects.size > 0
               ? Array.from(selectedProjects).join(" , ")
               : "",
+          start_date: date?.start || null,
+          end_date: date?.end || null,
         },
       });
 
@@ -446,10 +480,13 @@ export function ProcessInnovationPage() {
         totalProjects: parseNum(stats?.count_innovation_process_projects),
         averageScore: parseFloat(data[0].average_project_score),
         productionStopsPreventionSum: parseNum(stats?.sum_stopping_production),
+        reductionCostOprationSum: parseNum(stats?.sum_operating_cost_reduction),
         bottleneckRemovalCount: parseNum(stats?.count_throat_removal),
         currencyReductionSum: parseNum(stats?.sum_reduction_value_currency),
         frequentFailuresReductionSum: parseNum(stats?.sum_reducing_breakdowns),
         percentProductionStops: stats?.percent_sum_stopping_production,
+        percentOperatingCostBeforeInnovation:
+          stats?.percent_operating_cost_before_innovation,
         percentBottleneckRemoval: stats?.percent_throat_removal,
         percentCurrencyReduction: stats?.percent_reduction_value_currency,
         percentFailuresReduction: stats?.percent_reducing_breakdowns,
@@ -472,6 +509,10 @@ export function ProcessInnovationPage() {
           ...prev.currencyreduction,
           value: formatNumber(normalized.currencyReductionSum),
         },
+        decreaseCurrencyOperation: {
+          ...prev.decreaseCurrencyOperation,
+          value: formatNumber(normalized.reductionCostOprationSum),
+        },
       }));
       setStats(normalized);
     } catch (error) {
@@ -524,7 +565,7 @@ export function ProcessInnovationPage() {
           <Checkbox
             checked={selectedProjects.has(item.project_id)}
             onCheckedChange={() => handleSelectProject(item.project_id)}
-            className="data-[state=checked]:bg-emerald-600 data-[state=checked]:border-emerald-600"
+            className="data-[state=checked]:bg-pr-green data-[state=checked]:border-pr-green"
           />
         );
       case "details":
@@ -533,14 +574,14 @@ export function ProcessInnovationPage() {
             variant="ghost"
             size="sm"
             onClick={() => handleProjectDetails(item)}
-            className="text-pr-green hover:text-emerald-300 underline-offset-4 underline font-normal hover:bg-emerald-500/20 p-2 h-auto"
+            className="text-pr-green underline-offset-4 underline font-normal  p-2 h-auto"
           >
             جزئیات بیشتر
           </Button>
         );
       case "amount_currency_reduction":
         return (
-          <span className="font-medium text-emerald-400">
+          <span className="font-medium text-pr-green">
             {formatCurrency(String(value))}
           </span>
         );
@@ -593,18 +634,19 @@ export function ProcessInnovationPage() {
 
   return (
     <DashboardLayout title="نوآوری در فرآیند">
-      <div className="py-2 space-y-4">
+      <div className="flex flex-col gap-4">
         {/* Stats Cards */}
-        <div className="flex gap-6">
+        <div className="flex gap-4">
           <div className="space-y-4 w-full">
             {/* Stats Grid */}
-            <div className="grid grid-cols-2 gap-3">
+            <div className="h-full">
-              {loading || statsLoading
+              {loading || statsLoading ? (
-                ? // Loading skeleton for stats cards - matching new design
+                // Skeleton cards
-                  Array.from({ length: 4 }).map((_, index) => (
+                <div className="flex flex-wrap justify-between gap-3">
+                  {Array.from({ length: 6 }).map((_, index) => (
                     <BaseCard
                       key={`skeleton-${index}`}
-                      className="rounded-2xl overflow-hidden"
+                      className="rounded-2xl overflow-hidden w-full sm:w-[48%] md:w-[30%]"
                     >
                       <div className="flex flex-col justify-between gap-2">
                         <div className="flex justify-between items-center border-b-2 mx-4 border-gray-500/20">
@@ -612,7 +654,7 @@ export function ProcessInnovationPage() {
                             className="h-6 bg-gray-600 rounded animate-pulse"
                             style={{ width: "60%" }}
                           />
-                          <div className="p-3 bg-emerald-500/20 rounded-full w-fit">
+                          <div className="p-3 rounded-full w-fit">
                             <div className="w-6 h-6 bg-gray-600 rounded animate-pulse" />
                           </div>
                         </div>
@@ -628,42 +670,112 @@ export function ProcessInnovationPage() {
                         </div>
                       </div>
                     </BaseCard>
-                  ))
+                  ))}
-                : Object.entries(stateCard).map(([key, card]) => {
+                </div>
-                    // map percent values for each card key
+              ) : (
-                    const percentMap: Record<
+                <div className="flex flex-col h-full gap-5">
-                      string,
+                  <div className="flex flex-row gap-4 h-full">
-                      number | string | undefined
-                    > = {
-                      productionstopsprevention: stats.percentProductionStops,
-                      bottleneckremoval: stats.percentBottleneckRemoval,
-                      currencyreduction: stats.percentCurrencyReduction,
-                      frequentfailuresreduction: stats.percentFailuresReduction,
-                    };
-                    const percentValue = percentMap[key];
-
-                    return (
                     <BaseCard
-                        key={card.id}
+                      key={stateCard.productionstopsprevention.id}
-                        title={card.title}
+                      title={stateCard.productionstopsprevention.title}
-                        className="border-gray-700/50"
+                      className="border-gray-700/50 w-full"
-                        icon={card.icon}
+                      icon={stateCard.productionstopsprevention.icon}
                     >
                       <div className="flex items-center justify-center flex-col">
                         <div className="flex items-center gap-4">
                           <div className="text-center">
                             <p className="text-3xl text-pr-green font-bold mb-1">
-                                {card.value}
+                              {stateCard.productionstopsprevention.value}
                             </p>
                             <div className="text-[11px] text-[#ACACAC] font-light font-persian">
-                                {card.description}
+                              {stateCard.productionstopsprevention.description}
                             </div>
                           </div>
                         </div>
                       </div>
                     </BaseCard>
-                    );
+
-                  })}
+                    <BaseCard
+                      key={stateCard.frequentfailuresreduction.id}
+                      title={stateCard.frequentfailuresreduction.title}
+                      className="border-gray-700/50 w-full"
+                      icon={stateCard.frequentfailuresreduction.icon}
+                    >
+                      <div className="flex items-center justify-center flex-col">
+                        <div className="flex items-center gap-4">
+                          <div className="text-center">
+                            <p className="text-3xl text-pr-green font-bold mb-1">
+                              {stateCard.frequentfailuresreduction.value}
+                            </p>
+                            <div className="text-[11px] text-[#ACACAC] font-light font-persian">
+                              {stateCard.frequentfailuresreduction.description}
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </BaseCard>
+                  </div>
+                  <div className="flex flex-row gap-4 h-full">
+                    <BaseCard
+                      key={stateCard.currencyreduction.id}
+                      title={stateCard.currencyreduction.title}
+                      className="border-gray-700/50 w-full"
+                      icon={stateCard.currencyreduction.icon}
+                    >
+                      <div className="flex items-center justify-center flex-col">
+                        <div className="flex items-center gap-4">
+                          <div className="text-center">
+                            <p className="text-3xl text-pr-green font-bold mb-1">
+                              {stateCard.currencyreduction.value}
+                            </p>
+                            <div className="text-[11px] text-[#ACACAC] font-light font-persian">
+                              {stateCard.currencyreduction.description}
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </BaseCard>
+                    <BaseCard
+                      key={stateCard.decreaseCurrencyOperation.id}
+                      title={stateCard.decreaseCurrencyOperation.title}
+                      className="border-gray-700/50 w-full"
+                      icon={stateCard.decreaseCurrencyOperation.icon}
+                    >
+                      <div className="flex items-center justify-center flex-col">
+                        <div className="flex items-center gap-4">
+                          <div className="text-center">
+                            <p className="text-3xl text-pr-green font-bold mb-1">
+                              {stateCard.decreaseCurrencyOperation.value}
+                            </p>
+                            <div className="text-[11px] text-[#ACACAC] font-light font-persian">
+                              {stateCard.decreaseCurrencyOperation.description}
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </BaseCard>
+                    <BaseCard
+                      key={stateCard.bottleneckremoval.id}
+                      title={stateCard.bottleneckremoval.title}
+                      className="border-gray-700/50 w-full"
+                      icon={stateCard.bottleneckremoval.icon}
+                    >
+                      <div className="flex items-center justify-center flex-col">
+                        <div className="flex items-center gap-4">
+                          <div className="text-center">
+                            <p className="text-3xl text-pr-green font-bold mb-1">
+                              {stateCard.bottleneckremoval.value}
+                            </p>
+                            <div className="text-[11px] text-[#ACACAC] font-light font-persian">
+                              {stateCard.bottleneckremoval.description}
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </BaseCard>
+                  </div>
+                </div>
+              )}
             </div>
           </div>
 
@@ -674,13 +786,13 @@ export function ProcessInnovationPage() {
               - Nice Max: 75 (گرد و خوانا)
               - Ticks: [0, 20, 40, 60, 75]
               این باعث می‌شود نمودار زیباتر و خوانا‌تر باشد */}
-          <BaseCard className="rounded-2xl w-full overflow-hidden">
+          <BaseCard className="rounded-xl w-full overflow-hidden">
             <CustomBarChart
               title="تاثیرات فرآیندی به صورت درصد مقایسه ای"
               loading={statsLoading}
               data={[
                 {
-                  label: "کاهش توقفات تولید",
+                  label: "توقفات تولید",
                   value: Number(stats.percentProductionStops) || 0,
                   labelColor: "text-white",
                 },
@@ -690,17 +802,23 @@ export function ProcessInnovationPage() {
                   labelColor: "text-white",
                 },
                 {
-                  label: "کاهش ارز بری",
+                  label: "ارز بری",
                   value: Number(stats.percentCurrencyReduction) || 0,
                   labelColor: "text-white",
                 },
                 {
-                  label: "کاهش خرابی پر تکرار",
+                  label: "خرابی پر تکرار",
                   value: Number(stats.percentFailuresReduction) || 0,
                   labelColor: "text-white",
                 },
+                {
+                  label: "هزینه های عملیاتی",
+                  value:
+                    Number(stats.percentOperatingCostBeforeInnovation) || 0,
+                  labelColor: "text-white",
+                },
               ]}
-              barHeight="h-6"
+              barHeight="h-5"
               showAxisLabels={true}
             />
           </BaseCard>
@@ -710,7 +828,7 @@ export function ProcessInnovationPage() {
         <Card className="bg-transparent backdrop-blur-sm rounded-2xl overflow-hidden">
           <CardContent className="p-0">
             <div className="relative">
-              <Table containerClassName="overflow-auto custom-scrollbar max-h-[calc(90vh-400px)]">
+              <Table containerClassName="overflow-auto custom-scrollbar max-h-[calc(90vh-420px)]">
                 <TableHeader>
                   <TableRow className="bg-[#3F415A]">
                     {columns.map((column) => (
@@ -721,14 +839,7 @@ export function ProcessInnovationPage() {
                       >
                         {column.key === "select" ? (
                           <div className="flex items-center justify-center">
-                            <Checkbox
+                            <span></span>
-                              checked={
-                                selectedProjects.size === projects.length &&
-                                projects.length > 0
-                              }
-                              onCheckedChange={handleSelectAll}
-                              className="data-[state=checked]:bg-emerald-600 data-[state=checked]:border-emerald-600"
-                            />
                           </div>
                         ) : column.sortable ? (
                           <button
@@ -764,7 +875,7 @@ export function ProcessInnovationPage() {
                         {columns.map((column) => (
                           <TableCell
                             key={column.key}
-                            className="text-right whitespace-nowrap border-emerald-500/20 py-1 px-2"
+                            className="text-right whitespace-nowrap border-pr-green py-1 px-2"
                           >
                             <div className="flex items-center gap-2">
                               <div className="w-2.5 h-2.5 bg-gray-600 rounded-full animate-pulse" />
@@ -797,7 +908,7 @@ export function ProcessInnovationPage() {
                         {columns.map((column) => (
                           <TableCell
                             key={column.key}
-                            className={`text-right whitespace-nowrap border-emerald-500/20 py-1 px-2 ${column.key === "select" ? "flex justify-center items-center" : ""}`}
+                            className={`text-right whitespace-nowrap border-pr-green py-1 px-2 ${column.key === "select" ? "flex justify-center items-center" : ""}`}
                           >
                             {renderCellContent(project, column)}
                           </TableCell>
@@ -814,7 +925,7 @@ export function ProcessInnovationPage() {
               {loadingMore && (
                 <div className="flex items-center justify-center py-1">
                   <div className="flex items-center gap-2">
-                    <RefreshCw className="w-4 h-4 animate-spin text-emerald-400" />
+                    <RefreshCw className="w-4 h-4 animate-spin text-pr-green" />
                     <span className="font-persian text-gray-300 text-xs"></span>
                   </div>
                 </div>
@@ -876,7 +987,7 @@ export function ProcessInnovationPage() {
 
               <div className="flex items-center justify-between">
                 <h4 className="font-light text-sm text-white font-persian mb-2 flex items-center gap-1">
-                  <Building2 className="h-4 text-green-500 text-sm font-light" />
+                  <Building2 className="h-4 text-pr-green text-sm font-light" />
                   زمان شروع:
                 </h4>
                 <span className="text-white font-normal text-base font-persian">
@@ -891,7 +1002,7 @@ export function ProcessInnovationPage() {
 
               <div className="flex items-center justify-between">
                 <h4 className="font-light text-sm text-white font-persian mb-2 flex items-center gap-1">
-                  <PickaxeIcon className="h-4 text-green-500 text-sm font-light" />
+                  <PickaxeIcon className="h-4 text-pr-green text-sm font-light" />
                   زمان پایان:
                 </h4>
                 <span className="text-white font-normal text-base font-persian">
@@ -906,7 +1017,7 @@ export function ProcessInnovationPage() {
 
               <div className="flex items-center justify-between">
                 <h4 className="font-light text-sm text-white font-persian mb-2 flex items-center gap-1">
-                  <UsersIcon className="h-4 text-green-500 text-sm font-light" />
+                  <UsersIcon className="h-4 text-pr-green text-sm font-light" />
                   هزینه برآورد شده:
                 </h4>
                 <span className="text-white font-normal text-base font-persian">
@@ -924,7 +1035,7 @@ export function ProcessInnovationPage() {
               </div>
               <div className="flex items-center justify-between">
                 <h4 className="font-light text-sm text-white font-persian mb-2 flex items-center gap-1">
-                  <UserIcon className="h-4 text-green-500 text-sm font-light" />
+                  <UserIcon className="h-4 text-pr-green text-sm font-light" />
                   نفر مرتبط:
                 </h4>
                 <span className="text-white font-normal text-base font-persian">

app/components/dashboard/project-management/product-innovation-page.tsx

@@ -1,46 +1,37 @@
-import {
+import { ChevronDown, ChevronUp, RefreshCw } from "lucide-react";
-  ArrowDownCircle,
-  ArrowUpCircle,
-  Building2,
-  ChevronDown,
-  ChevronUp,
-  CirclePause,
-  DollarSign,
-  Funnel,
-  Loader2,
-  PickaxeIcon,
-  RefreshCw,
-  TrendingUp,
-  UserIcon,
-  UsersIcon,
-  Wrench,
-} from "lucide-react";
 import { useCallback, useEffect, useRef, useState } from "react";
 import toast from "react-hot-toast";
+import { Bar, BarChart, LabelList } from "recharts";
 import { Badge } from "~/components/ui/badge";
-import { Button } from "~/components/ui/button";
-import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
-import { MetricCard } from "~/components/ui/metric-card";
 import { BaseCard } from "~/components/ui/base-card";
+import { Button } from "~/components/ui/button";
+import { Card, CardContent } from "~/components/ui/card";
 import { Checkbox } from "~/components/ui/checkbox";
-import { Bar, BarChart, LabelList } from "recharts"
+import { MetricCard } from "~/components/ui/metric-card";
 import {
   Popover,
-  PopoverTrigger,
   PopoverContent,
-} from "~/components/ui/popover"
+  PopoverTrigger,
+} from "~/components/ui/popover";
 
-import { FunnelChart } from "~/components/ui/funnel-chart";
+import {
-import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from "recharts";
+  CartesianGrid,
+  Legend,
+  Line,
+  LineChart,
+  ResponsiveContainer,
+  Tooltip,
+  XAxis,
+  YAxis,
+} from "recharts";
 import {
   Dialog,
   DialogContent,
-  DialogDescription,
-  DialogFooter,
   DialogHeader,
   DialogTitle,
 } from "~/components/ui/dialog";
-import { Label } from "~/components/ui/label";
+import { FunnelChart } from "~/components/ui/funnel-chart";
+import { Skeleton } from "~/components/ui/skeleton";
 import {
   Table,
   TableBody,
@@ -49,12 +40,12 @@ import {
   TableHeader,
   TableRow,
 } from "~/components/ui/table";
+import { Tooltip as TooltipSh, TooltipTrigger } from "~/components/ui/tooltip";
+import { useStoredDate } from "~/hooks/useStoredDate";
 import apiService from "~/lib/api";
-import { formatNumber, handleDataValue } from "~/lib/utils";
+import { EventBus, formatNumber, handleDataValue } from "~/lib/utils";
+import type { CalendarDate } from "~/types/util.type";
 import { DashboardLayout } from "../layout";
-import { Skeleton } from "~/components/ui/skeleton";
-import { Tooltip as TooltipSh,  TooltipTrigger, TooltipContent } from "~/components/ui/tooltip";
-
 
 interface ProjectData {
   project_no: string;
@@ -139,15 +130,16 @@ const columns = [
   { key: "details", label: "جزئیات پروژه", sortable: false, width: "140px" },
 ];
 
-
 export default function Timeline(valueTimeLine: string) {
   const stages = ["تجاری سازی", "توسعه", "تحلیل بازار", "ثبت ایده"];
-  const currentStage = stages?.toReversed()?.findIndex((x : string) => x == valueTimeLine)
+  const currentStage = stages
+    ?.toReversed()
+    ?.findIndex((x: string) => x == valueTimeLine);
   const per = () => {
-    const main = stages?.findIndex((x) => x == "ثبت ایده")
+    const main = stages?.findIndex((x) => x == "ثبت ایده");
-    console.log( 'yay ' ,  25 * main + 12.5);
+    console.log("yay ", 25 * main + 12.5);
-    return 25  * main + 12.5
+    return 25 * main + 12.5;
-  }
+  };
   return (
     <div className="w-full  p-4">
       {/* Year labels */}
@@ -160,12 +152,17 @@ export default function Timeline( valueTimeLine : string) {
       {/* Timeline bar */}
       <div className="relative rounded-lg flex mb-4 items-center">
         {stages.map((stage, index) => (
-          <div key={stage} className="flex-1  flex flex-col items-center relative">
+          <div
+            key={stage}
+            className="flex-1  flex flex-col items-center relative"
+          >
             <TooltipSh>
               <TooltipTrigger asChild>
                 <div
                   className={`w-full py-2 text-center transition-colors duration-300 ${
-                    index <= currentStage ? "bg-[#3D7968] text-white" : "bg-[#3AEA83] text-slate-600"
+                    index <= currentStage
+                      ? "bg-[#3D7968] text-white"
+                      : "bg-[#3AEA83] text-slate-600"
                   }`}
                 >
                   <span className="mt-1 text-sm">{stage}</span>
@@ -176,25 +173,32 @@ export default function Timeline( valueTimeLine : string) {
         ))}
 
         {/* Vertical line showing current position */}
-        { valueTimeLine?.length > 0 && ( <> <div
+        {valueTimeLine?.length > 0 && (
+          <>
+            {" "}
+            <div
               className={`absolute top-0 h-[150%] bottom-0 w-[2px] bg-white rounded-full`}
-          style={{ left: `${(currentStage + 0.5) * (100 / stages.length)}%` }}
+              style={{
+                left: `${(currentStage + 0.5) * (100 / stages.length)}%`,
+              }}
             />
             <div
               className="absolute top-15 h-[max-content] translate-x-[-50%] text-xs text-gray-300 border-gray-400 rounded-md border px-2  bottom-0"
-          style={{ left: `${(currentStage + 0.5) * (100 / stages.length)}%` }}
+              style={{
-        >وضعیت فعلی</div>
+                left: `${(currentStage + 0.5) * (100 / stages.length)}%`,
-       </> ) }
+              }}
-
+            >
+              وضعیت فعلی
+            </div>
+          </>
+        )}
       </div>
     </div>
   );
 }
 
-
-
 export function ProductInnovationPage() {
-   const [showPopup, setShowPopup] = useState(false);
+  // const [showPopup, setShowPopup] = useState(false);
   const [projects, setProjects] = useState<ProductInnovationData[]>([]);
   const [loading, setLoading] = useState(false);
   const [loadingMore, setLoadingMore] = useState(false);
@@ -237,11 +241,11 @@ export function ProductInnovationPage() {
     revenueNewProducts: {
       id: "revenueNewProducts",
       title: "سهم از درآمد برای محصولات جدید",
-      value: "0",
+      value: 0,
       description: "میلیون ریال",
       descriptionPercent: "درصد به کل درآمد",
       color: "text-[#3AEA83]",
-      percent : "0"
+      percent: 0,
     },
     newProductExports: {
       id: "newProductExports",
@@ -259,19 +263,22 @@ export function ProductInnovationPage() {
     },
   });
 
+  const [date, setDate] = useStoredDate();
+
   const observerRef = useRef<HTMLDivElement>(null);
   const fetchingRef = useRef(false);
 
-
-
   const handleProjectDetails = async (project: ProductInnovationData) => {
     setSelectedProjectDetails(project);
-    console.log(project)
     setDetailsDialogOpen(true);
-    await fetchPopupData(project);
+    await fetchPopupData(project, date?.start, date?.end);
   };
 
-  const fetchPopupData = async (project: ProductInnovationData) => {
+  const fetchPopupData = async (
+    project: ProductInnovationData,
+    startDate?: string,
+    endDate?: string
+  ) => {
     try {
       setPopupLoading(true);
 
@@ -279,25 +286,26 @@ export function ProductInnovationPage() {
       const statsResponse = await apiService.call({
         innovation_product_popup_function1: {
           project_id: project.project_id
-        }
+        },
       });
 
       if (statsResponse.state === 0) {
         const statsData = JSON.parse(statsResponse.data);
-        if (statsData.innovation_product_popup_function1 && statsData.innovation_product_popup_function1[0]) {
+        if (
-          setPopupStats(JSON.parse(statsData.innovation_product_popup_function1)[0]);
+          statsData.innovation_product_popup_function1 &&
+          statsData.innovation_product_popup_function1[0]
+        ) {
+          setPopupStats(
+            JSON.parse(statsData.innovation_product_popup_function1)[0]
+          );
         }
       }
 
       // Fetch export chart data
       const chartResponse = await apiService.select({
         ProcessName: "export_product_innovation",
-        OutputFields: [
+        OutputFields: ["product_title", "full_season", "sum(export_revenue)"],
-          "product_title",
+        GroupBy: ["product_title", "full_season"],
-          "full_season",
-          "sum(export_revenue)"
-        ],
-        GroupBy: ["product_title", "full_season"]
       });
       if (chartResponse.state === 0) {
         const chartData = JSON.parse(chartResponse.data);
@@ -305,14 +313,13 @@ export function ProductInnovationPage() {
           // Set all data for line chart
 
           // Filter data for the selected project (bar chart)
-          const filteredData = chartData.filter(item =>
+          const filteredData = chartData.filter(
-            item.product_title === project?.title
+            (item) => item.product_title === project?.title
           );
           setAllExportData(chartData);
           setExportChartData(filteredData);
         }
       }
-
     } catch (error) {
       console.error("Error fetching popup data:", error);
     } finally {
@@ -358,10 +365,14 @@ export function ProductInnovationPage() {
           "knowledge_based_certificate_obtained",
           "knowledge_based_certificate_number",
           "certificate_obtain_date",
-          "issuing_authority"
+          "issuing_authority",
         ],
         Sorts: [["start_date", "asc"]],
-        Conditions: [["type_of_innovation", "=", "نوآوری در محصول"]],
+        Conditions: [
+          ["type_of_innovation", "=", "نوآوری در محصول", "and"],
+          ["start_date", ">=", date?.start || null, "and"],
+          ["start_date", "<=", date?.end || null],
+        ],
         Pagination: { PageNumber: pageToFetch, PageSize: pageSize },
       });
 
@@ -427,8 +438,12 @@ export function ProductInnovationPage() {
   const fetchStats = async () => {
     try {
       setStatsLoading(true);
+
       const raw = await apiService.call<any>({
-        innovation_product_function: {},
+        innovation_product_function: {
+          start_date: date?.start || null,
+          end_date: date?.end || null,
+        },
       });
 
       let payload: any = JSON.parse(raw?.data);
@@ -444,21 +459,25 @@ export function ProductInnovationPage() {
         return 0;
       };
 
-      const data: Array<any> = JSON.parse(
+      const data: Array<any> = JSON.parse(payload?.innovation_product_function);
-        payload?.innovation_product_function
-      );
       const stats = data[0];
       const normalized: ProductInnovationStats = {
         new_products_revenue_share: parseNum(stats?.new_products_revenue_share),
-        new_products_revenue_share_percent: parseNum(stats?.new_products_revenue_share_percent),
+        new_products_revenue_share_percent: parseNum(
+          stats?.new_products_revenue_share_percent
+        ),
         import_impact: parseNum(stats?.import_impact),
         new_products_export: parseNum(stats?.new_products_export),
         all_funnel: parseNum(stats?.all_funnel),
         successful_sample_funnel: parseNum(stats?.successful_sample_funnel),
         successful_products_funnel: parseNum(stats?.successful_products_funnel),
-        successful_improvement_or_change_funnel: parseNum(stats?.successful_improvement_or_change_funnel),
+        successful_improvement_or_change_funnel: parseNum(
+          stats?.successful_improvement_or_change_funnel
+        ),
         new_product_funnel: parseNum(stats?.new_product_funnel),
-        count_innovation_construction_inside_projects: parseNum(stats?.count_innovation_construction_inside_projects),
+        count_innovation_construction_inside_projects: parseNum(
+          stats?.count_innovation_construction_inside_projects
+        ),
         average_project_score: parseNum(stats?.average_project_score),
       };
 
@@ -466,8 +485,8 @@ export function ProductInnovationPage() {
         ...prev,
         revenueNewProducts: {
           ...prev.revenueNewProducts,
-          value: formatNumber(normalized?.new_products_revenue_share),
+          value: normalized.new_products_revenue_share,
-          percent: formatNumber(normalized?.new_products_revenue_share_percent),
+          percent: normalized.new_products_revenue_share_percent,
         },
         impactOnImports: {
           ...prev.impactOnImports,
@@ -488,12 +507,20 @@ export function ProductInnovationPage() {
   };
 
   useEffect(() => {
-    fetchProjects(true);
+    EventBus.on("dateSelected", (date: CalendarDate) => {
-  }, [sortConfig]);
+      if (date) {
+        setDate(date);
+      }
+    });
+  }, []);
 
   useEffect(() => {
-    fetchStats();
+    if (date.end && date.start) fetchProjects(true);
-  }, []);
+  }, [sortConfig, date]);
+
+  useEffect(() => {
+    if (date.end && date.start) fetchStats();
+  }, [date]);
 
   useEffect(() => {
     if (currentPage > 1) {
@@ -538,39 +565,42 @@ export function ProductInnovationPage() {
     setHasMore(true);
   };
 
-
+  // const formatCurrency = (amount: string | number) => {
-  const formatCurrency = (amount: string | number) => {
+  //   if (!amount) return "0 ریال";
-    if (!amount) return "0 ریال";
+  //   const numericAmount =
-    const numericAmount =
+  //     typeof amount === "string"
-      typeof amount === "string"
+  //       ? parseFloat(amount.replace(/,/g, ""))
-        ? parseFloat(amount.replace(/,/g, ""))
+  //       : amount;
-        : amount;
+  //   if (isNaN(numericAmount)) return "0 ریال";
-    if (isNaN(numericAmount)) return "0 ریال";
+  //   return new Intl.NumberFormat("fa-IR").format(numericAmount) + " ریال";
-    return new Intl.NumberFormat("fa-IR").format(numericAmount) + " ریال";
+  // };
-  };
 
   // Transform data for line chart
   const transformDataForLineChart = (data: any[]) => {
-    const seasons = [...new Set(data.map(item => item.full_season))];
+    const seasons = [...new Set(data.map((item) => item.full_season))];
-    const products = [...new Set(data.map(item => item.product_title))];
+    const products = [...new Set(data.map((item) => item.product_title))];
-    return seasons.map(season => {
+    return seasons.map((season) => {
       const seasonData: any = { season };
-      products.forEach(product => {
+      products.forEach((product) => {
-        const productData = data.find(item =>
+        const productData = data.find(
+          (item) =>
             item.product_title === product && item.full_season === season
         );
-        seasonData[product] = productData?.export_revenue_sum > 0 && productData  ?  Math.round(productData?.export_revenue_sum) : 0;
+        seasonData[product] =
+          productData?.export_revenue_sum > 0 && productData
+            ? Math.round(productData?.export_revenue_sum)
+            : 0;
       });
       return seasonData;
     });
   };
 
-  const getRatingColor = (rating: string | number) => {
+  // const getRatingColor = (rating: string | number) => {
-    const numRating = typeof rating === "string" ? parseInt(rating) : rating;
+  //   const numRating = typeof rating === "string" ? parseInt(rating) : rating;
-    if (numRating >= 150) return "text-emerald-400";
+  //   if (numRating >= 150) return "text-emerald-400";
-    if (numRating >= 100) return "text-blue-400";
+  //   if (numRating >= 100) return "text-blue-400";
-    return "text-red-400";
+  //   return "text-red-400";
-  };
+  // };
 
   const statusColor = (status: projectStatus): any => {
     let el = null;
@@ -615,8 +645,9 @@ export function ProductInnovationPage() {
             variant="ghost"
             size="sm"
             onClick={() => {
-              handleProjectDetails(item)}}
+              handleProjectDetails(item);
-            className="text-emerald-400 underline underline-offset-4 font-ligth text-sm hover:bg-emerald-500/20 p-2 h-auto"
+            }}
+            className="text-emerald-400 underline underline-offset-4 font-ligth text-sm p-2 h-auto"
           >
             جزئیات بیشتر
           </Button>
@@ -628,7 +659,9 @@ export function ProductInnovationPage() {
           </Badge>
         );
       case "title":
-        return <span className="font-light text-sm text-white">{String(value)}</span>;
+        return (
+          <span className="font-light text-sm text-white">{String(value)}</span>
+        );
       case "project_status":
         return (
           <div className="flex items-center text-sm font-light gap-1">
@@ -652,7 +685,11 @@ export function ProductInnovationPage() {
           </Badge>
         );
       default:
-        return <span className="text-white text-sm font-light">{String(value) || "-"}</span>;
+        return (
+          <span className="text-white text-sm font-light">
+            {String(value) || "-"}
+          </span>
+        );
     }
   };
 
@@ -667,14 +704,15 @@ export function ProductInnovationPage() {
     })
     .map((item) => ({
       label: item.full_season,
-    value: item.export_revenue_sum < 0 ? 0  : Math.round(item.export_revenue_sum) ,
+      value:
+        item.export_revenue_sum < 0 ? 0 : Math.round(item.export_revenue_sum),
     }));
 
   return (
     <DashboardLayout title="نوآوری در محصول">
-      <div className="space-y-4 flex justify-center gap-4">
+      <div className=" flex w-full  gap-4">
         {/* Stats Cards */}
-        <div className="flex flex-col gap-6">
+        <div className="flex flex-col flex-1 gap-6">
           <div className="space-y-6 w-full">
             {/* Stats Grid */}
             <div className="grid grid-cols-2 grid-rows-2 gap-5 h-full">
@@ -716,21 +754,30 @@ export function ProductInnovationPage() {
                   <div className="col-span-2">
                     <MetricCard
                       title={stateCard.revenueNewProducts.title}
-                      value={formatNumber(stateCard.revenueNewProducts.value)}
+                      value={stateCard.revenueNewProducts.value}
-                      percentValue={formatNumber(stateCard.revenueNewProducts.percent)}
+                      percentValue={stateCard.revenueNewProducts.percent}
                       valueLabel={stateCard.revenueNewProducts.description}
-                      percentLabel={stateCard.revenueNewProducts.descriptionPercent}
+                      percentLabel={
+                        stateCard.revenueNewProducts.descriptionPercent
+                      }
                     />
                   </div>
 
                   {/* Second card */}
                   <div>
-                    <BaseCard title={stateCard.newProductExports.title} className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] backdrop-blur-sm border-gray-700/50">
+                    <BaseCard
+                      title={stateCard.newProductExports.title}
+                      className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] backdrop-blur-sm border-gray-700/50"
+                    >
                       <div className="flex items-center justify-center flex-col">
                         <div className="flex items-center gap-4">
                           <div className="text-center">
-                            <p className="text-3xl font-bold mb-1 text-pr-green">{stateCard.newProductExports.value}</p>
+                            <p className="text-3xl font-bold mb-1 text-pr-green">
-                            <div className="text-xs text-gray-400 font-persian">{stateCard.newProductExports.description}</div>
+                              {stateCard.newProductExports.value}
+                            </p>
+                            <div className="text-xs text-gray-400 font-persian">
+                              {stateCard.newProductExports.description}
+                            </div>
                           </div>
                         </div>
                       </div>
@@ -739,12 +786,19 @@ export function ProductInnovationPage() {
 
                   {/* Third card - basic BaseCard */}
                   <div>
-                    <BaseCard title={stateCard.impactOnImports.title} className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] backdrop-blur-sm border-gray-700/50">
+                    <BaseCard
+                      title={stateCard.impactOnImports.title}
+                      className="bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] backdrop-blur-sm border-gray-700/50"
+                    >
                       <div className="flex items-center justify-center flex-col">
                         <div className="flex items-center gap-4">
                           <div className="text-center">
-                            <p className="text-3xl font-bold mb-1 text-pr-red">{stateCard.impactOnImports.value}</p>
+                            <p className="text-3xl font-bold mb-1 text-pr-red">
-                            <div className="text-xs text-gray-400 font-persian">{stateCard.impactOnImports.description}</div>
+                              {stateCard.impactOnImports.value}
+                            </p>
+                            <div className="text-xs text-gray-400 font-persian">
+                              {stateCard.impactOnImports.description}
+                            </div>
                           </div>
                         </div>
                       </div>
@@ -756,7 +810,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="قيف فرآیند پروژه ها"
@@ -793,7 +847,7 @@ export function ProductInnovationPage() {
         </div>
 
         {/* Data Table */}
-        <Card className="bg-transparent rounded-2xl overflow-hidden">
+        <Card className="bg-transparent flex-2  rounded-2xl overflow-hidden">
           <CardContent className="p-0">
             <div className="relative">
               <Table containerClassName="overflow-auto custom-scrollbar backdrop max-h-[calc(100vh-200px)]">
@@ -902,7 +956,10 @@ export function ProductInnovationPage() {
             <div className="flex gap-4 text-sm text-gray-300 font-persian justify-between sm:flex-col xl:flex-row">
               <div className="text-center gap-2 items-center  xl:w-1/3 pr-36 sm:w-full">
                 <div className="text-sm font-semibold text-white">
-                  کل پروژه ها :{formatNumber(stats?.count_innovation_construction_inside_projects)}
+                  کل پروژه ها :
+                  {formatNumber(
+                    stats?.count_innovation_construction_inside_projects
+                  )}
                 </div>
               </div>
 
@@ -917,7 +974,9 @@ export function ProductInnovationPage() {
                   <div className="text-bold text-sm text-white">میانگین :‌</div>
                   <div className="font-bold text-sm text-white">
                     {formatNumber(
-                      ((stats.average_project_score ?? 0) as number).toFixed?.(1) ?? 0
+                      ((stats.average_project_score ?? 0) as number).toFixed?.(
+                        1
+                      ) ?? 0
                     )}
                   </div>
                 </div>
@@ -941,29 +1000,47 @@ export function ProductInnovationPage() {
             <div className="space-y-4">
               {/* Stats Cards */}
               <div className="space-y-4">
-            <h3 className="font-bold text-base">{selectedProjectDetails?.title}</h3>
+                <h3 className="font-bold text-base">
-            <p className="py-2">{selectedProjectDetails?.project_description}</p>
+                  {selectedProjectDetails?.title}
+                </h3>
+                <p className="py-2">
+                  {selectedProjectDetails?.project_description}
+                </p>
               </div>
-        <Timeline valueTimeLine={selectedProjectDetails?.current_status} />
+              <Timeline
+                valueTimeLine={selectedProjectDetails?.current_status}
+              />
 
               {/* Technical Knowledge */}
               <div className=" rounded-lg py-2 mb-0">
-                <h3 className="text-sm text-white font-semibold mb-2">دانش فنی محصول جدید</h3>
+                <h3 className="text-sm text-white font-semibold mb-2">
+                  دانش فنی محصول جدید
+                </h3>
                 <div className="flex gap-4 items-center">
                   <div className="flex items-center gap-2">
-    <span className="text-sm text-white font-light">توسعه درونزا</span>
+                    <span className="text-sm text-white font-light">
+                      توسعه درونزا
+                    </span>
 
                     <Checkbox
-      checked={selectedProjectDetails?.developed_technology_type === "توسعه درونزا"}
+                      checked={
+                        selectedProjectDetails?.developed_technology_type ===
+                        "توسعه درونزا"
+                      }
                       className="data-[state=checked]:bg-emerald-600 data-[state=checked]:border-emerald-600"
                     />
                   </div>
 
                   <div className="flex items-center gap-2">
-    <span className="text-sm text-white font-light">همکاری فناورانه</span>
+                    <span className="text-sm text-white font-light">
+                      همکاری فناورانه
+                    </span>
 
                     <Checkbox
-      checked={selectedProjectDetails?.developed_technology_type === "همکاری فناوری"}
+                      checked={
+                        selectedProjectDetails?.developed_technology_type ===
+                        "همکاری فناوری"
+                      }
                       className="data-[state=checked]:bg-emerald-600 data-[state=checked]:border-emerald-600"
                     />
                   </div>
@@ -971,7 +1048,10 @@ export function ProductInnovationPage() {
                   <div className="flex items-center gap-2">
                     <span className="text-sm text-white font-light">سایر</span>
                     <Checkbox
-      checked={selectedProjectDetails?.developed_technology_type === "سایر"}
+                      checked={
+                        selectedProjectDetails?.developed_technology_type ===
+                        "سایر"
+                      }
                       className="data-[state=checked]:bg-emerald-600 data-[state=checked]:border-emerald-600"
                     />
                   </div>
@@ -984,15 +1064,20 @@ export function ProductInnovationPage() {
                   استانداردهای ملی و بین‌المللی اخذ شده
                 </h3>
 
-  {selectedProjectDetails?.obtained_standard_title && selectedProjectDetails?.obtained_standard_title.length > 0 ? (
+                {selectedProjectDetails?.obtained_standard_title &&
+                selectedProjectDetails?.obtained_standard_title.length > 0 ? (
                   <div className="space-y-2">
-      {(Array.isArray(selectedProjectDetails?.obtained_standard_title)
+                    {(Array.isArray(
+                      selectedProjectDetails?.obtained_standard_title
+                    )
                       ? selectedProjectDetails?.obtained_standard_title
                       : [selectedProjectDetails?.obtained_standard_title]
                     ).map((standard, index) => (
                       <div key={index} className="flex items-center gap-2">
                         <div className="w-2 h-2 bg-emerald-500 rounded-full"></div>
-          <span className="text-sm text-white font-light">{standard}</span>
+                        <span className="text-sm text-white font-light">
+                          {standard}
+                        </span>
                       </div>
                     ))}
                   </div>
@@ -1005,7 +1090,8 @@ export function ProductInnovationPage() {
 
               {/* Knowledge-based Certificate Button */}
               <div className="justify-self-centerr grid py-1  mx-auto">
-      {selectedProjectDetails?.knowledge_based_certificate_obtained === "خیر" ? (
+                {selectedProjectDetails?.knowledge_based_certificate_obtained ===
+                "خیر" ? (
                   <div className=" border border-pr-red mx-auto rounded-lg p-2 text-center">
                     <button className="text-pr-red font-bold text-sm">
                       گواهی دانش‌بنیان ندارد
@@ -1036,10 +1122,14 @@ export function ProductInnovationPage() {
                             </p>
                             <p className="text-sm text-white">
                               <span className="font-bold">تاریخ اخذ: </span>
-                    {handleDataValue(selectedProjectDetails?.certificate_obtain_date) || "—"}
+                              {handleDataValue(
+                                selectedProjectDetails?.certificate_obtain_date
+                              ) || "—"}
                             </p>
                             <p className="text-sm text-white">
-                    <span className="font-bold">مرجع صادرکننده: </span>
+                              <span className="font-bold">
+                                مرجع صادرکننده:{" "}
+                              </span>
                               {selectedProjectDetails?.issuing_authority || "—"}
                             </p>
                           </div>
@@ -1081,16 +1171,32 @@ export function ProductInnovationPage() {
                 <div className="rounded-lg pt-4 grid grid-cols-2 gap-4 w-full">
                   <MetricCard
                     title="میزان صادارت محصول جدید"
-                    value={Math.round(popupStats?.new_products_export > 0 ? popupStats?.new_products_export : 0)}
+                    value={Math.round(
-                    percentValue={Math.round(popupStats?.new_products_export_percent > 0 ? popupStats?.new_products_export_percent : 0)}
+                      popupStats?.new_products_export > 0
+                        ? popupStats?.new_products_export
+                        : 0
+                    )}
+                    percentValue={Math.round(
+                      popupStats?.new_products_export_percent > 0
+                        ? popupStats?.new_products_export_percent
+                        : 0
+                    )}
                     valueLabel="میلیون ریال"
                     percentLabel="درصد به کل صادرات"
                   />
 
                   <MetricCard
                     title="تاثیر در واردات"
-                    value={Math.round(popupStats?.import_impact > 0 ? popupStats?.import_impact : 0)}
+                    value={Math.round(
-                    percentValue={Math.round(popupStats?.import_impact_percent > 0 ? popupStats?.import_impact_percent : 0)}
+                      popupStats?.import_impact > 0
+                        ? popupStats?.import_impact
+                        : 0
+                    )}
+                    percentValue={Math.round(
+                      popupStats?.import_impact_percent > 0
+                        ? popupStats?.import_impact_percent
+                        : 0
+                    )}
                     valueLabel="میلیون ریال"
                     percentLabel="درصد صرفه جویی"
                   />
@@ -1098,7 +1204,9 @@ export function ProductInnovationPage() {
 
                 {/* Export Revenue Bar Chart */}
                 <div className="bg-[linear-gradient(to_bottom_left,#464861,45%,#111628)]  rounded-lg px-6 py-4">
-                  <h3 className="text-sm font-semibold text-white">ظرفیت صادر شده</h3>
+                  <h3 className="text-sm font-semibold text-white">
+                    ظرفیت صادر شده
+                  </h3>
                   <div className="h-60">
                     {exportChartData.length > 0 ? (
                       <ResponsiveContainer width="100%" height="100%">
@@ -1116,52 +1224,149 @@ export function ProductInnovationPage() {
                             axisLine={false}
                             stroke="#C3C3C3"
                             tickMargin={8}
-                            tickFormatter={(value: string) => `${value.split(" ")[0]} ${formatNumber(value.split(" ")[1]).replaceAll('٬','')}`}
+                            tickFormatter={(value: string) =>
+                              `${value.split(" ")[0]} ${formatNumber(value.split(" ")[1]).replaceAll("٬", "")}`
+                            }
                             fontSize={11}
                           />
-                          <YAxis tickLine={false} axisLine={false} stroke="#9CA3AF" fontSize={11} tick={{ dx: -50 }} tickFormatter={(value: number) => `${formatNumber(value)} میلیون`} />
+                          <YAxis
+                            tickLine={false}
+                            axisLine={false}
+                            stroke="#9CA3AF"
+                            fontSize={11}
+                            tick={{ dx: -50 }}
+                            tickFormatter={(value: number) =>
+                              `${formatNumber(value)} میلیون`
+                            }
+                          />
                           <Bar dataKey="value" fill="#10B981" radius={10}>
-                            <LabelList formatter={(value: number) => `${formatNumber(value)}`} position="top" offset={15} fill="F9FAFB" className="fill-foreground" fontSize={16} />
+                            <LabelList
+                              formatter={(value: number) =>
+                                `${formatNumber(value)}`
+                              }
+                              position="top"
+                              offset={15}
+                              fill="F9FAFB"
+                              className="fill-foreground"
+                              fontSize={16}
+                            />
                           </Bar>
                         </BarChart>
                       </ResponsiveContainer>
                     ) : (
-                      <div className="flex items-center justify-center h-full text-gray-400">داده‌ای برای نمایش وجود ندارد</div>
+                      <div className="flex items-center justify-center h-full text-gray-400">
+                        داده‌ای برای نمایش وجود ندارد
+                      </div>
                     )}
                   </div>
                 </div>
 
                 {/* Export Revenue Line Chart */}
                 <div className="bg-[linear-gradient(to_bottom_left,#464861,45%,#111628)]  rounded-lg px-6 py-4">
-                  <h3 className="text-sm font-semibold text-white">ظرفیت صادر شده</h3>
+                  <h3 className="text-sm font-semibold text-white">
+                    ظرفیت صادر شده
+                  </h3>
                   <div className="h-60">
                     {allExportData.length > 0 ? (
                       <ResponsiveContainer width="100%" height="100%">
-                        <LineChart className="aspect-auto w-full" data={transformDataForLineChart(allExportData)} margin={{ top: 20, right: 30, left: 10, bottom: 50 }}>
+                        <LineChart
+                          className="aspect-auto w-full"
+                          data={transformDataForLineChart(allExportData)}
+                          margin={{ top: 20, right: 30, left: 10, bottom: 50 }}
+                        >
                           <CartesianGrid vertical={false} stroke="#374151" />
-                          <XAxis dataKey="season" stroke="#9CA3AF" fontSize={11} tick={({ x, y, payload }) => (
+                          <XAxis
+                            dataKey="season"
+                            stroke="#9CA3AF"
+                            fontSize={11}
+                            tick={({ x, y, payload }) => (
                               <g transform={`translate(${x},${y + 10})`}>
-                              <text x={-40} y={15} dy={0} textAnchor="end" fill="#9CA3AF" fontSize={11} transform="rotate(-45)">{(payload as any).value}</text>
+                                <text
+                                  x={-40}
+                                  y={15}
+                                  dy={0}
+                                  textAnchor="end"
+                                  fill="#9CA3AF"
+                                  fontSize={11}
+                                  transform="rotate(-45)"
+                                >
+                                  {(payload as any).value}
+                                </text>
                               </g>
-                          )} />
+                            )}
-                          <YAxis tickLine={false} axisLine={false} stroke="#9CA3AF" fontSize={11} tick={{ dx: -50 }} tickFormatter={(value) => `${formatNumber(value)} میلیون`} />
+                          />
-                          <Tooltip formatter={(value: number) => `${formatNumber(value)} میلیون`} contentStyle={{ backgroundColor: "#1F2937", border: "1px solid #374151", borderRadius: "6px", padding: "6px 10px", fontSize: "11px", color: "#F9FAFB" }} />
+                          <YAxis
-                          <Legend layout="vertical" verticalAlign="middle" align="right" iconType={"plainline"} className="!flex" wrapperStyle={{ fontSize: 11, paddingLeft: 12, gap: 10 }} />
+                            tickLine={false}
-                          {[...new Set(allExportData.map((item) => item.product_title))].slice(0, 5).map((product, index) => {
+                            axisLine={false}
-                            const colors = ["#10B981", "#EF4444", "#3B82F6", "#F59E0B", "#8B5CF6"];
+                            stroke="#9CA3AF"
-                            return <Line key={product} type="linear" dot={false} activeDot={{ r: 5 }} dataKey={product} stroke={colors[index % colors.length]} strokeWidth={2} />;
+                            fontSize={11}
+                            tick={{ dx: -50 }}
+                            tickFormatter={(value) =>
+                              `${formatNumber(value)} میلیون`
+                            }
+                          />
+                          <Tooltip
+                            formatter={(value: number) =>
+                              `${formatNumber(value)} میلیون`
+                            }
+                            contentStyle={{
+                              backgroundColor: "#1F2937",
+                              border: "1px solid #374151",
+                              borderRadius: "6px",
+                              padding: "6px 10px",
+                              fontSize: "11px",
+                              color: "#F9FAFB",
+                            }}
+                          />
+                          <Legend
+                            layout="vertical"
+                            verticalAlign="middle"
+                            align="right"
+                            iconType={"plainline"}
+                            className="!flex"
+                            wrapperStyle={{
+                              fontSize: 11,
+                              paddingLeft: 12,
+                              gap: 10,
+                            }}
+                          />
+                          {[
+                            ...new Set(
+                              allExportData.map((item) => item.product_title)
+                            ),
+                          ]
+                            .slice(0, 5)
+                            .map((product, index) => {
+                              const colors = [
+                                "#10B981",
+                                "#EF4444",
+                                "#3B82F6",
+                                "#F59E0B",
+                                "#8B5CF6",
+                              ];
+                              return (
+                                <Line
+                                  key={product}
+                                  type="linear"
+                                  dot={false}
+                                  activeDot={{ r: 5 }}
+                                  dataKey={product}
+                                  stroke={colors[index % colors.length]}
+                                  strokeWidth={2}
+                                />
+                              );
                             })}
                         </LineChart>
                       </ResponsiveContainer>
                     ) : (
-                      <div className="flex items-center justify-center h-full text-gray-400">داده‌ای برای نمایش وجود ندارد</div>
+                      <div className="flex items-center justify-center h-full text-gray-400">
+                        داده‌ای برای نمایش وجود ندارد
+                      </div>
                     )}
                   </div>
                 </div>
               </div>
             )}
-
-
           </div>
         </DialogContent>
       </Dialog>

app/components/dashboard/project-management/project-management-page.tsx

@@ -1,6 +1,8 @@
+import { saveAs } from "file-saver";
 import { ChevronDown, ChevronUp, RefreshCw } from "lucide-react";
-import { useCallback, useEffect, useRef, useState, useMemo } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import toast from "react-hot-toast";
+import XLSX from "xlsx-js-style";
 import { Badge } from "~/components/ui/badge";
 import { Card, CardContent } from "~/components/ui/card";
 import {
@@ -12,9 +14,15 @@ import {
   TableHeader,
   TableRow,
 } from "~/components/ui/table";
+import { useStoredDate } from "~/hooks/useStoredDate";
 import apiService from "~/lib/api";
-import { formatCurrency } from "~/lib/utils";
+import {
-import { formatNumber } from "~/lib/utils";
+  EventBus,
+  formatCurrency,
+  formatNumber,
+  handleDataValue,
+} from "~/lib/utils";
+import type { CalendarDate } from "~/types/util.type";
 import { DashboardLayout } from "../layout";
 
 interface ProjectData {
@@ -169,6 +177,12 @@ export function ProjectManagementPage() {
   const fetchingRef = useRef(false);
   const scrollTimeoutRef = useRef<NodeJS.Timeout | null>(null);
   const scrollContainerRef = useRef<HTMLDivElement>(null);
+  // const [date, setDate] = useState<CalendarDate>({
+  //   start: `${jy}/01/01`,
+  //   end: `${jy}/12/30`,
+  // });
+
+  const [date, setDate] = useStoredDate();
 
   const fetchProjects = async (reset = false) => {
     // Prevent concurrent API calls
@@ -200,7 +214,10 @@ export function ProjectManagementPage() {
         OutputFields: outputFields,
         Pagination: { PageNumber: pageToFetch, PageSize: pageSize },
         Sorts: sortField ? [[sortField, sortConfig.direction]] : [],
-        Conditions: [],
+        Conditions: [
+          ["start_date", ">=", date?.start || null, "and"],
+          ["start_date", "<=", date?.end || null],
+        ],
       });
 
       if (response.state === 0) {
@@ -265,6 +282,17 @@ export function ProjectManagementPage() {
     }
   };
 
+  useEffect(() => {
+    const handler = (date: CalendarDate) => {
+      if (date) setDate(date);
+    };
+
+    EventBus.on("dateSelected", handler);
+
+    return () => {
+      EventBus.off("dateSelected", handler);
+    };
+  }, []);
   const loadMore = useCallback(() => {
     if (hasMore && !loading && !loadingMore && !fetchingRef.current) {
       setCurrentPage((prev) => prev + 1);
@@ -272,9 +300,11 @@ export function ProjectManagementPage() {
   }, [hasMore, loading, loadingMore]);
 
   useEffect(() => {
+    if (date.end && date.start) {
       fetchProjects(true);
       fetchTotalCount();
-  }, [sortConfig]);
+    }
+  }, [sortConfig, date]);
 
   useEffect(() => {
     if (currentPage > 1) {
@@ -287,7 +317,8 @@ export function ProjectManagementPage() {
     const scrollContainer = scrollContainerRef.current;
 
     const handleScroll = () => {
-      if (!scrollContainer || !hasMore || loadingMore || fetchingRef.current) return;
+      if (!scrollContainer || !hasMore || loadingMore || fetchingRef.current)
+        return;
 
       // Clear previous timeout
       if (scrollTimeoutRef.current) {
@@ -307,7 +338,9 @@ export function ProjectManagementPage() {
     };
 
     if (scrollContainer) {
-      scrollContainer.addEventListener("scroll", handleScroll, { passive: true });
+      scrollContainer.addEventListener("scroll", handleScroll, {
+        passive: true,
+      });
     }
 
     return () => {
@@ -337,7 +370,10 @@ export function ProjectManagementPage() {
       const response = await apiService.select({
         ProcessName: "project",
         OutputFields: ["count(project_no)"],
-        Conditions: [],
+        Conditions: [
+          ["start_date", ">=", date?.start || null, "and"],
+          ["start_date", "<=", date?.end || null],
+        ],
       });
 
       if (response.state === 0) {
@@ -358,14 +394,14 @@ export function ProjectManagementPage() {
     }
   };
 
-  const handleRefresh = () => {
+  // const handleRefresh = () => {
-    fetchingRef.current = false; // Reset fetching state on refresh
+  //   fetchingRef.current = false; // Reset fetching state on refresh
-    setCurrentPage(1);
+  //   setCurrentPage(1);
-    setProjects([]);
+  //   setProjects([]);
-    setHasMore(true);
+  //   setHasMore(true);
-    fetchProjects(true);
+  //   fetchProjects(true);
-    fetchTotalCount();
+  //   fetchTotalCount();
-  };
+  // };
 
   // ...existing code...
 
@@ -630,7 +666,7 @@ export function ProjectManagementPage() {
       .filter((v) => v !== null) as number[];
     res["remaining_time"] = remainingValues.length
       ? Math.round(
-          remainingValues.reduce((a, b) => a + b, 0) / remainingValues.length,
+          remainingValues.reduce((a, b) => a + b, 0) / remainingValues.length
         )
       : null;
 
@@ -644,7 +680,7 @@ export function ProjectManagementPage() {
           const num = Number(
             String(raw)
               .toString()
-              .replace(/[^0-9.-]/g, ""),
+              .replace(/[^0-9.-]/g, "")
           );
           return Number.isFinite(num) ? num : NaN;
         })
@@ -761,16 +797,94 @@ export function ProjectManagementPage() {
     }
   };
 
-  const totalPages = Math.ceil(totalCount / pageSize);
+  // const totalPages = Math.ceil(totalCount / pageSize);
+
+  const exportToExcel = async () => {
+    let arr = [];
+    const data = await fetchExcelData();
+    debugger;
+    for (let i = 0; i < data.length; i++) {
+      let obj: Record<string, any> = {};
+      const project = data[i];
+
+      Object.entries(project).forEach(([pKey, pValue]) => {
+        Object.values(columns).forEach((col) => {
+          if (pKey === col.key) {
+            ``;
+            obj[col.label] = handleDataValue(
+              pValue?.includes(",") ? pValue.replaceAll(",", "") : pValue
+            );
+          }
+        });
+      });
+
+      arr.push(obj);
+    }
+
+    // تبدیل داده‌ها به worksheet
+    const worksheet = XLSX.utils.json_to_sheet(arr);
+
+    // ساخت workbook
+    const workbook = XLSX.utils.book_new();
+    XLSX.utils.book_append_sheet(workbook, worksheet, "People");
+
+    // تبدیل به فایل باینری
+    const excelBuffer = XLSX.write(workbook, {
+      bookType: "xlsx",
+      type: "array",
+    });
+
+    const blob = new Blob([excelBuffer], {
+      type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+    });
+    saveAs(blob, "people.xls");
+  };
+
+  const fetchExcelData = async () => {
+    const fetchableColumns = columns.filter((c) => !c.computed);
+    const outputFields = fetchableColumns.map((c) => c.apiField ?? c.key);
+    const sortCol = columns.find((c) => c.key === sortConfig.field);
+    const sortField = sortCol?.computed
+      ? undefined
+      : (sortCol?.apiField ?? sortCol?.key);
+
+    const response = await apiService.select({
+      ProcessName: "project",
+      OutputFields: outputFields,
+      Sorts: sortField ? [[sortField, sortConfig.direction]] : [],
+      Conditions: [
+        ["start_date", ">=", date?.start || null, "and"],
+        ["start_date", "<=", date?.end || null],
+      ],
+    });
+    const parsedData = JSON.parse(response.data);
+    return parsedData;
+  };
 
   return (
     <DashboardLayout title="مدیریت پروژه‌ها">
       <div className="space-y-6">
+        {/* <div className="flex justify-end w-full mb-0 pl-2">
+          <Button
+            className="flex w-max  justify-center rounded-xl mb-4 border-gray-500/20 border-2 cursor-pointer transition-all hover:bg-[#3F415A]/50 bg-[#3F415A]  py-3 text-center items-center gap-3 "
+            variant="ghost"
+            size="sm"
+            onClick={exportToExcel}
+          >
+            <FileChartColumnIncreasing />
+            دانلود فایل اکسل
+          </Button>
+        </div> */}
+
         {/* Data Table */}
         <Card className="bg-transparent backdrop-blur-sm rounded-2xl overflow-hidden">
+          {/* <div onClick={exportToExcel}>DownloadExcle</div> */}
           <CardContent className="p-0">
             <div className="relative">
-              <div ref={scrollContainerRef} className="relative overflow-auto custom-scrollbar max-h-[calc(100vh-120px)]">
+              <div
+                ref={scrollContainerRef}
+                className="relative overflow-auto custom-scrollbar max-h-[calc(100vh-120px)]"
+              >
                 <Table className="table-fixed">
                   <TableHeader className="sticky top-0 z-50 bg-[#3F415A]">
                     <TableRow className="bg-[#3F415A]">

app/components/dashboard/sidebar.tsx

@@ -110,12 +110,12 @@ const menuItems: MenuItem[] = [
 ];
 
 const bottomMenuItems: MenuItem[] = [
-  {
+  // {
-    id: "settings",
+  //   id: "settings",
-    label: "تنظیمات",
+  //   label: "تنظیمات",
-    icon: Settings,
+  //   icon: Settings,
-    href: "/dashboard/settings",
+  //   href: "/dashboard/settings",
-  },
+  // },
   {
     id: "logout",
     label: "خروج",

app/components/dashboard/strategic-alignment-popup.tsx

@@ -11,8 +11,10 @@ import {
 } from "recharts";
 import { Dialog, DialogContent, DialogHeader } from "~/components/ui/dialog";
 import { Skeleton } from "~/components/ui/skeleton";
+import { useStoredDate } from "~/hooks/useStoredDate";
 import apiService from "~/lib/api";
-import { formatNumber } from "~/lib/utils";
+import { EventBus, formatNumber } from "~/lib/utils";
+import type { CalendarDate } from "~/types/util.type";
 import { ChartContainer } from "../ui/chart";
 import {
   DropdownMenu,
@@ -24,7 +26,7 @@ import { TruncatedText } from "../ui/truncatedText";
 
 interface StrategicAlignmentData {
   strategic_theme: string;
-  operational_fee_sum: number;
+  operational_fee_count: number;
   percentage?: number;
 }
 
@@ -125,22 +127,37 @@ export function StrategicAlignmentPopup({
     dropDownItems: [],
   });
 
+  const [date, setDate] = useStoredDate();
+
   useEffect(() => {
     if (open) {
       fetchData();
     }
   }, [open]);
 
+  useEffect(() => {
+    const handler = (date: CalendarDate) => {
+      if (date) setDate(date);
+    };
+
+    EventBus.on("dateSelected", handler);
+
+    return () => {
+      EventBus.off("dateSelected", handler);
+    };
+  }, []);
+
   const fetchData = async () => {
     setLoading(true);
     try {
       const response = await apiService.select({
         ProcessName: "project",
-        OutputFields: [
+        OutputFields: ["strategic_theme", "count(operational_fee)"],
-          "strategic_theme",
-          "sum(operational_fee) as operational_fee_sum",
-        ],
         GroupBy: ["strategic_theme"],
+        Conditions: [
+          ["start_date", ">=", date?.start || null, "and"],
+          ["start_date", "<=", date?.end || null],
+        ],
       });
 
       const responseData =
@@ -168,9 +185,13 @@ export function StrategicAlignmentPopup({
           ProcessName: "project",
           OutputFields: [
             "value_technology_and_innovation",
-            "sum(operational_fee)",
+            "count(operational_fee)",
+          ],
+          Conditions: [
+            ["strategic_theme", "=", item, "and"],
+            ["start_date", ">=", date?.start || null, "and"],
+            ["start_date", "<=", date?.end || null],
           ],
-          Conditions: [["strategic_theme", "=", item]],
           GroupBy: ["value_technology_and_innovation"],
         });
 
@@ -233,13 +254,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 +268,9 @@ 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 || []);

app/components/ecosystem/info-panel.tsx

@@ -1,7 +1,6 @@
 "use client";
 
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
-import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
 import {
   Area,
   AreaChart,
@@ -11,9 +10,12 @@ import {
   XAxis,
   YAxis,
 } from "recharts";
+import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
 import { CustomBarChart } from "~/components/ui/custom-bar-chart";
+import { useStoredDate } from "~/hooks/useStoredDate";
 import apiService from "~/lib/api";
-import { formatNumber } from "~/lib/utils";
+import { EventBus, formatNumber } from "~/lib/utils";
+import type { CalendarDate } from "~/types/util.type";
 
 export interface CompanyDetails {
   id: string;
@@ -62,27 +64,50 @@ export function InfoPanel({ selectedCompany }: InfoPanelProps) {
   const [counts, setCounts] = useState<EcosystemCounts | null>(null);
   const [processData, setProcessData] = useState<ProcessActorsData[]>([]);
   const [isLoading, setIsLoading] = useState(true);
+  // const [date, setDate] = useState<CalendarDate>();
+  const [date, setDate] = useStoredDate();
 
   useEffect(() => {
+    const handler = (date: CalendarDate) => {
+      if (date) setDate(date);
+    };
+
+    EventBus.on("dateSelected", handler);
+
+    return () => {
+      EventBus.off("dateSelected", handler);
+    };
+  }, []);
+
+  useEffect(() => {
+    if (date.end && date.start) fetchCounts();
+  }, [date]);
+
   const fetchCounts = async () => {
     setIsLoading(true);
     try {
       const [countsRes, processRes] = await Promise.all([
         apiService.call<EcosystemCounts>({
-            ecosystem_count_function: {},
+          ecosystem_count_function: {
+            start_date: date?.start || null,
+            end_date: date?.end || null,
+          },
         }),
         apiService.call<ProcessActorsResponse[]>({
-            process_creating_actors_function: {},
+          process_creating_actors_function: {
+            start_date: date?.start || null,
+            end_date: date?.end || null,
+          },
         }),
       ]);
 
       setCounts(
-          JSON.parse(JSON.parse(countsRes.data).ecosystem_count_function)[0],
+        JSON.parse(JSON.parse(countsRes.data).ecosystem_count_function)[0]
       );
 
       // Process the years data and fill missing years
       const processedData = processYearsData(
-          JSON.parse(JSON.parse(processRes?.data)?.process_creating_actors),
+        JSON.parse(JSON.parse(processRes?.data)?.process_creating_actors)
       );
       setProcessData(processedData);
     } catch (err) {
@@ -91,8 +116,6 @@ export function InfoPanel({ selectedCompany }: InfoPanelProps) {
       setIsLoading(false);
     }
   };
-    fetchCounts();
-  }, []);
 
   // Helper function to safely parse numbers
   const parseNumber = (value: string | undefined): number => {
@@ -103,7 +126,7 @@ export function InfoPanel({ selectedCompany }: InfoPanelProps) {
 
   // Helper function to process years data and fill missing years
   const processYearsData = (
-    data: ProcessActorsResponse[],
+    data: ProcessActorsResponse[]
   ): ProcessActorsData[] => {
     if (!data || data.length === 0) return [];
 
@@ -121,7 +144,7 @@ export function InfoPanel({ selectedCompany }: InfoPanelProps) {
         acc[item.start_year] = item.total_count;
         return acc;
       },
-      {} as Record<string, number>,
+      {} as Record<string, number>
     );
 
     for (let year = minYear; year <= maxYear; year++) {
@@ -167,7 +190,7 @@ export function InfoPanel({ selectedCompany }: InfoPanelProps) {
         { label: "شتابدهنده", value: parseNumber(counts.accelerator_count) },
         { label: "دانشگاه", value: parseNumber(counts.university_count) },
         { label: "صندوق های مالی", value: parseNumber(counts.fund_count) },
-        { label: "شرکت", value: parseNumber(counts.company_count) },
+        { label: "تامین کننده", value: parseNumber(counts.company_count) },
       ]
     : [];
 
@@ -462,7 +485,13 @@ export function InfoPanel({ selectedCompany }: InfoPanelProps) {
                   margin={{ top: 25, right: 30, left: 0, bottom: 0 }}
                 >
                   <defs>
-      <linearGradient id="fillDesktop" x1="0" y1="0" x2="0" y2="1">
+                    <linearGradient
+                      id="fillDesktop"
+                      x1="0"
+                      y1="0"
+                      x2="0"
+                      y2="1"
+                    >
                       <stop offset="0%" stopColor="#3AEA83" stopOpacity={1} />
                       <stop offset="100%" stopColor="#3AEA83" stopOpacity={0} />
                     </linearGradient>
@@ -501,7 +530,14 @@ export function InfoPanel({ selectedCompany }: InfoPanelProps) {
                     activeDot={({ cx, cy, payload }) => (
                       <g>
                         {/* Small circle */}
-              <circle cx={cx} cy={cy} r={5} fill="#3AEA83" stroke="#fff" strokeWidth={2} />
+                        <circle
+                          cx={cx}
+                          cy={cy}
+                          r={5}
+                          fill="#3AEA83"
+                          stroke="#fff"
+                          strokeWidth={2}
+                        />
                         {/* Year label above point */}
                         <text
                           x={cx}
@@ -518,7 +554,6 @@ export function InfoPanel({ selectedCompany }: InfoPanelProps) {
                   />
                 </AreaChart>
               </ResponsiveContainer>
-
             ) : (
               <div className="flex items-center justify-center h-full text-gray-400 font-persian">
                 داده‌ای برای نمایش وجود ندارد
@@ -526,7 +561,6 @@ export function InfoPanel({ selectedCompany }: InfoPanelProps) {
             )}
           </div>
         </CardContent>
-
       </Card>
     </div>
   );

app/components/ecosystem/network-graph.tsx

@@ -1,10 +1,19 @@
-import React, { useEffect, useRef, useState, useCallback } from "react";
 import * as d3 from "d3";
-import apiService from "../../lib/api";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { useStoredDate } from "~/hooks/useStoredDate";
+import { EventBus } from "~/lib/utils";
+import type { CalendarDate } from "~/types/util.type";
 import { useAuth } from "../../contexts/auth-context";
+import apiService from "../../lib/api";
 
 const API_BASE_URL =
-  import.meta.env.VITE_API_URL || "https://inogen-back.pelekan.org/api";
+//بندر امام
+// import.meta.env.VITE_API_URL || "https://inogen-back.pelekan.org/api";
+//آپادانا
+import.meta.env.VITE_API_URL || "https://APADANA-IATM-back.pelekan.org/api";
+//نوری
+// import.meta.env.VITE_API_URL || "https://NOPC-IATM-back.pelekan.org/api";
+
 
 export interface Node {
   id: string;
@@ -59,7 +68,10 @@ function isBrowser(): boolean {
   return typeof window !== "undefined";
 }
 
-export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps) {
+export function NetworkGraph({
+  onNodeClick,
+  onLoadingChange,
+}: NetworkGraphProps) {
   const svgRef = useRef<SVGSVGElement | null>(null);
   const [nodes, setNodes] = useState<Node[]>([]);
   const [links, setLinks] = useState<Link[]>([]);
@@ -68,6 +80,21 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
   const [error, setError] = useState<string | null>(null);
   const { token } = useAuth();
 
+  // const [date, setDate] = useState<CalendarDate>();
+
+  const [date, setDate] = useStoredDate();
+  useEffect(() => {
+    const handler = (date: CalendarDate) => {
+      if (date) setDate(date);
+    };
+
+    EventBus.on("dateSelected", handler);
+
+    return () => {
+      EventBus.off("dateSelected", handler);
+    };
+  }, []);
+
   useEffect(() => {
     if (isBrowser()) {
       const timer = setTimeout(() => setIsMounted(true), 100);
@@ -80,16 +107,21 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
       if (!token?.accessToken) return null;
       return `${API_BASE_URL}/getimage?stageID=${stageid}&nameOrID=image&token=${token.accessToken}`;
     },
-    [token?.accessToken],
+    [token?.accessToken]
   );
 
-  const callAPI = useCallback(async (stage_id: number) => {
+  const callAPI = useCallback(
+    async (stage_id: number) => {
       return await apiService.call<any>({
         get_values_workflow_function: {
           stage_id: stage_id,
+          // start_date: date?.start || null,
+          // end_date: date?.end || null,
         },
       });
-  }, []);
+    },
+    [date]
+  );
 
   useEffect(() => {
     if (!isMounted) return;
@@ -101,27 +133,34 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
       setIsLoading(true);
       try {
         const res = await apiService.call<any[]>({
-          graph_production_function: {},
+          graph_production_function: {
+            start_date: date.start || null,
+            end_date: date.end || null,
+          },
         });
         if (aborted) return;
 
         const data = parseApiResponse(JSON.parse(res.data)?.graph_production);
         console.log(
           "All available fields in first item:",
-          Object.keys(data[0] || {}),
+          Object.keys(data[0] || {})
         );
 
         // نود مرکزی
         const centerNode: Node = {
           id: "center",
-          label: "پتروشیمی بندر امام",
+          // label: "پتروشیمی بندر امام",
+          // label: "پتروشیمی نوری",
+          label: "پتروشیمی آپادانا",
           category: "center",
           stageid: 0,
           isCenter: true,
         };
 
         // دسته‌بندی‌ها
-        const categories = Array.from(new Set(data.map((item: any) => item.category)));
+        const categories = Array.from(
+          new Set(data.map((item: any) => item.category))
+        );
 
         const categoryNodes: Node[] = categories.map((cat, index) => ({
           id: `cat-${index}`,
@@ -167,10 +206,11 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
       aborted = true;
       controller.abort();
     };
-  }, [isMounted, token, getImageUrl]);
+  }, [isMounted, token, getImageUrl, date]);
 
   useEffect(() => {
-    if (!isMounted || !svgRef.current || isLoading || nodes.length === 0) return;
+    if (!isMounted || !svgRef.current || isLoading || nodes.length === 0)
+      return;
 
     const svg = d3.select(svgRef.current);
     const width = svgRef.current.clientWidth;
@@ -210,7 +250,7 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
       مشاور: "#10B981",
       "دانش بنیان": "#F59E0B",
       استارتاپ: "#EF4444",
-      شرکت: "#8B5CF6",
+      "تامین کننده": "#8B5CF6",
       صندوق: "#06B6D4",
       شتابدهنده: "#9333EA",
       "مرکز نوآوری": "#F472B6",
@@ -225,12 +265,18 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
           .forceLink<Node, Link>(links)
           .id((d) => d.id)
           .distance(150)
-          .strength(0.2),
+          .strength(0.2)
       )
       .force("charge", d3.forceManyBody().strength(-300))
       .force("center", d3.forceCenter(width / 2, height / 2))
-      .force("radial", d3.forceRadial(d => d.isCenter ? 0 : 300, width/2, height/2))
+      .force(
-      .force("collision", d3.forceCollide().radius((d) => (d.isCenter ? 50 : 35)));
+        "radial",
+        d3.forceRadial((d) => (d.isCenter ? 0 : 300), width / 2, height / 2)
+      )
+      .force(
+        "collision",
+        d3.forceCollide().radius((d) => (d.isCenter ? 50 : 35))
+      );
 
     // Initial zoom to show entire graph
     const initialScale = 0.6;
@@ -242,12 +288,12 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
       zoom.transform,
       d3.zoomIdentity
         .translate(initialTranslate[0], initialTranslate[1])
-        .scale(initialScale),
+        .scale(initialScale)
     );
 
     // Fix center node
-    const centerNode = nodes.find(n => n.isCenter);
+    const centerNode = nodes.find((n) => n.isCenter);
-    const categoryNodes = nodes.filter(n => !n.isCenter && n.stageid === -1);
+    const categoryNodes = nodes.filter((n) => !n.isCenter && n.stageid === -1);
 
     if (centerNode) {
       const centerX = width / 2;
@@ -270,7 +316,6 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
     // نودهای نهایی **هیچ fx/fy نداشته باشند**
     // فقط forceLink آن‌ها را به دسته‌ها متصل نگه می‌دارد
 
-    
     // const finalNodes = nodes.filter(n => !n.isCenter && n.stageid !== -1);
 
     // categoryNodes.forEach((catNode) => {
@@ -286,7 +331,6 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
     //   });
     // });
 
-
     // Curved links
     const link = container
       .selectAll(".link")
@@ -305,7 +349,7 @@ 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>()
@@ -331,13 +375,62 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
     nodeGroup.each(function (d) {
       const group = d3.select(this);
 
+      // if (d.isCenter) {
+      //   const rect = group
+      //     .append("rect")
+      //     .attr("width", 200)
+      //     .attr("height", 80)
+      //     .attr("x", -100) // نصف عرض جدید منفی
+      //     .attr("y", -40) // نصف ارتفاع جدید منفی
+      //     .attr("rx", 8)
+      //     .attr("ry", 8)
+      //     .attr("fill", categoryToColor[d.category] || "#94A3B8")
+      //     .attr("stroke", "#FFFFFF")
+      //     .attr("stroke-width", 3)
+      //     .style("pointer-events", "none");
+
+      //   if (d.imageUrl || d.isCenter) {
+      //     const pattern = defs
+      //       .append("pattern")
+      //       .attr("id", `image-${d.id}`)
+      //       .attr("x", 0)
+      //       .attr("y", 0)
+      //       .attr("width", 1)
+      //       .attr("height", 1);
+
+      //     pattern
+      //       .append("image")
+      //       .attr("x", 0)
+      //       .attr("y", 0)
+      //       .attr("width", 200) // ← هم‌اندازه با مستطیل
+      //       .attr("height", 80)
+      //       .attr("href", d.isCenter ? "/main-circle.png" : d.imageUrl)
+      //       .attr("preserveAspectRatio", "xMidYMid slice");
+
+      //     rect.attr("fill", `url(#image-${d.id})`);
+      //   }
+      // } 
+      // راه حل ساده‌تر - ابعاد ثابت با حفظ نسبت
 if (d.isCenter) {
+
+  //آپادانا
+const fixedWidth = 198;
+const fixedHeight = 200; // یا می‌توانید براساس نسبت تصویر محاسبه کنید
+
+//بندر امام
+// const fixedWidth = 100;
+// const fixedHeight = 80; // یا می‌توانید براساس نسبت تصویر محاسبه کنید
+
+//نوری
+// const fixedWidth = 100;
+// const fixedHeight = 80; // یا می‌توانید براساس نسبت تصویر محاسبه کنید
+  
   const rect = group
     .append("rect")
-          .attr("width", 200)
+    .attr("width", fixedWidth)
-          .attr("height", 80)
+    .attr("height", fixedHeight)
-          .attr("x", -100) // نصف عرض جدید منفی
+    .attr("x", -fixedWidth / 2)
-          .attr("y", -40)  // نصف ارتفاع جدید منفی
+    .attr("y", -fixedHeight / 2)
     .attr("rx", 8)
     .attr("ry", 8)
     .attr("fill", categoryToColor[d.category] || "#94A3B8")
@@ -345,7 +438,6 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
     .attr("stroke-width", 3)
     .style("pointer-events", "none");
 
-        if (d.imageUrl || d.isCenter) {
   const pattern = defs
     .append("pattern")
     .attr("id", `image-${d.id}`)
@@ -358,14 +450,15 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
     .append("image")
     .attr("x", 0)
     .attr("y", 0)
-            .attr("width", 200)  // ← هم‌اندازه با مستطیل
+    .attr("width", fixedWidth)
-            .attr("height", 80)
+    .attr("height", fixedHeight)
     .attr("href", d.isCenter ? "/main-circle.png" : d.imageUrl)
-            .attr("preserveAspectRatio", "xMidYMid slice");
+    .attr("preserveAspectRatio", "xMidYMid meet"); // حفظ نسبت تصویر
 
   rect.attr("fill", `url(#image-${d.id})`);
+
 }
-      } else {
+      else {
         const circle = group
           .append("circle")
           .attr("r", 25)
@@ -408,7 +501,22 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
     .append("text")
     .text((d) => d.label)
     .attr("text-anchor", "middle")
-      .attr("dy", (d) => (d.isCenter ? 50 : 45))
+    .attr("dy", (d) => {
+      if (d.isCenter) {
+
+        //آپادانا
+        const centerNodeHeight = 200; // ارتفاع نود مرکزی
+        
+        //بندر امام
+        // const centerNodeHeight = 80; // ارتفاع نود مرکزی
+
+        //نوری 
+        // const centerNodeHeight = 80; // ارتفاع نود مرکزی
+
+        return centerNodeHeight / 2 + 20; // نصف ارتفاع + فاصله 20px
+      }
+      return 45; // برای نودهای دیگر
+    })
     .attr("font-size", (d) => (d.isCenter ? "14px" : "12px"))
     .attr("font-weight", "bold")
     .attr("fill", "#F9FAFB")
@@ -439,7 +547,9 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
 
     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
@@ -456,6 +566,7 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
         onLoadingChange?.(true);
 
         try {
+          if (date.start && date.end) {
             const res = await callAPI(d.stageid);
             const responseData = JSON.parse(res.data);
             const fieldValues =
@@ -464,15 +575,15 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
             const filteredFields = fieldValues.filter(
               (field: any) =>
                 !["image", "img", "full_name", "about_collaboration"].includes(
-                field.F.toLowerCase(),
+                  field.F.toLowerCase()
-              ),
+                )
             );
 
             const descriptionField = fieldValues.find(
               (field: any) =>
                 field.F.toLowerCase().includes("description") ||
                 field.F.toLowerCase().includes("about_collaboration") ||
-              field.F.toLowerCase().includes("about"),
+                field.F.toLowerCase().includes("about")
             );
 
             const companyDetails: CompanyDetails = {
@@ -485,6 +596,7 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
             };
 
             onNodeClick(companyDetails);
+          }
         } catch (error) {
           console.error("Failed to fetch company details:", error);
           // Keep the basic details already shown
@@ -513,7 +625,7 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
     return () => {
       simulation.stop();
     };
-  }, [nodes, links, isLoading, isMounted, onNodeClick, callAPI]);
+  }, [nodes, links, isLoading, isMounted, onNodeClick, callAPI, date]);
 
   if (error) {
     return (
@@ -589,5 +701,4 @@ export function NetworkGraph({ onNodeClick, onLoadingChange }: NetworkGraphProps
   );
 }
 
-
 export default NetworkGraph;

app/components/ui/Calendar.tsx

@@ -0,0 +1,67 @@
+import { ChevronLeft, ChevronRight } from "lucide-react";
+import React from "react";
+
+interface MonthItem {
+  id: string;
+  label: string;
+  start: string;
+  end: string;
+}
+
+// interface CurrentDay {
+//   start: string;
+//   end: string;
+//   month: string;
+// }
+
+interface CalendarProps {
+  title: string;
+  nextYearHandler: () => void;
+  prevYearHandler: () => void;
+  currentYear?: number;
+  monthList: Array<MonthItem>;
+  selectedDate?: string;
+  selectDateHandler: (item: MonthItem) => void;
+}
+
+export const Calendar: React.FC<CalendarProps> = ({
+  title,
+  nextYearHandler,
+  prevYearHandler,
+  currentYear,
+  monthList,
+  selectedDate,
+  selectDateHandler,
+}) => {
+  return (
+    <div className="filter-box bg-pr-gray  w-full px-1">
+      <header className="flex flex-row border-b border-[#5F6284] pb-1.5 justify-center">
+        <span className="font-light">{title}</span>
+        <div className="flex flex-row items-center gap-3">
+          <ChevronRight
+            className="inline-block w-6 h-6 cursor-pointer"
+            onClick={nextYearHandler}
+          />
+          <span className="font-light">{currentYear}</span>
+          <ChevronLeft
+            className="inline-block w-6 h-6 cursor-pointer"
+            onClick={prevYearHandler}
+          />
+        </div>
+      </header>
+      <div className="content flex flex-col gap-2 text-center pt-1 cursor-pointer">
+        {monthList.map((item, index) => (
+          <span
+            key={`${item.id}-${index}`}
+            className={`text-lg hover:bg-[#33364D] p-1 rounded-xl transition-all duration-300 ${
+              selectedDate === item.label ? `bg-[#33364D]` : ""
+            }`}
+            onClick={() => selectDateHandler(item)}
+          >
+            {item.label}
+          </span>
+        ))}
+      </div>
+    </div>
+  );
+};

app/components/ui/base-card.tsx

@@ -23,22 +23,34 @@ export function BaseCard({
   return (
     <Card
       className={cn(
-        "bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] backdrop-blur-sm py-4 grid items-center",
+        "bg-[linear-gradient(to_bottom_left,#464861,50%,#111628)] backdrop-blur-sm py-2 pb-0 grid items-center",
         className
       )}
     >
       {Icon && title ? (
-         <CardHeader className={cn("border-b-2 border-gray-500/20 py-2 px-0 pb-4", headerClassName)}>
+        <CardHeader
-          <CardTitle className="text-white text-sm text-right font-persian px-4 my-auto items-center flex w-full justify-between">{title} {<Icon />} </CardTitle>
+          className={cn(
+            "border-b-2 border-gray-500/20 py-2 px-0 pb-4",
+            headerClassName
+          )}
+        >
+          <CardTitle className="text-white text-sm text-right font-persian px-4 my-auto items-center flex w-full justify-between">
+            {title} {<Icon />}{" "}
+          </CardTitle>
         </CardHeader>
-      ) : 
+      ) : withHeader && title ? (
-      withHeader && title ? (
+        <CardHeader
-        <CardHeader className={cn("pb-2 border-b-2 border-gray-500/20", headerClassName)}>
+          className={cn("pb-2 border-b-2 border-gray-500/20", headerClassName)}
-          <CardTitle className="text-white text-sm text-right font-persian px-4">{title}</CardTitle>
+        >
+          <CardTitle className="text-white text-sm text-right font-persian px-4">
+            {title}
+          </CardTitle>
         </CardHeader>
       ) : title ? (
         <div className="border-b-2 border-gray-500/20 pb-2">
-          <h3 className="text-sm font-bold text-white text-right font-persian px-4">{title}</h3>
+          <h3 className="text-sm font-bold text-white text-right font-persian px-4">
+            {title}
+          </h3>
         </div>
       ) : null}
       <CardContent className={cn("py-2 px-4 ", contentClassName)}>

app/components/ui/custom-bar-chart.tsx

@@ -1,4 +1,4 @@
-import { formatNumber, calculateNiceRange } from "~/lib/utils";
+import { calculateNiceRange, formatNumber } from "~/lib/utils";
 
 export interface BarChartData {
   label: string;
@@ -18,7 +18,7 @@ interface CustomBarChartProps {
   showAxisLabels?: boolean;
   className?: string;
   loading?: boolean;
-  hasPercent ?: boolean
+  hasPercent?: boolean;
 }
 
 export function CustomBarChart({
@@ -39,7 +39,7 @@ export function CustomBarChart({
   // Loading skeleton
   if (loading) {
     return (
-      <div className={`space-y-6 p-4 ${className}`} style={{ height }}>
+      <div className={`space-y-6 p-4 pt-0 ${className}`} style={{ height }}>
         {title && (
           <div className="h-7 bg-gray-600 rounded animate-pulse mb-4 w-1/2"></div>
         )}
@@ -71,7 +71,7 @@ export function CustomBarChart({
     <div className={`space-y-6 ${className}`} style={{ height }}>
       {title && (
         <div className="border-b-[#3F415A] border-b-2">
-          <h3 className="text-sm font-semibold text-white font-persian text-right p-4">
+          <h3 className="text-sm font-semibold text-white font-persian text-right px-4 pb-3">
             {title}
           </h3>
         </div>
@@ -86,7 +86,7 @@ export function CustomBarChart({
           return (
             <div key={index} className="flex items-center gap-3">
               <span
-                className={`font-persian text-sm font-normal min-w-[120px] text-right ${
+                className={`font-persian text-sm font-normal min-w-[120px] text-left ${
                   item.labelColor || "text-white"
                 }`}
               >
@@ -109,7 +109,8 @@ export function CustomBarChart({
                 <span className={`text-base font-normal text-left text-white`}>
                   {item.valuePrefix || ""}
 
-                  {formatNumber(parseFloat(displayValue))}{ hasPercent ? "%" : ""}
+                  {formatNumber(parseFloat(displayValue))}
+                  {hasPercent ? "%" : ""}
                   {item.valueSuffix || ""}
                 </span>
               </div>

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));
@@ -50,15 +51,15 @@ export function FunnelChart({ data, title, className = "" }: FunnelChartProps) {
 
             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')}

app/components/ui/metric-card.tsx

@@ -17,9 +17,9 @@ export function MetricCard({
   percentLabel = "درصد به کل",
 }: MetricCardProps) {
   return (
-    <BaseCard title={title}>
+    <BaseCard title={title} className="h-full">
       <div className="flex items-center justify-center flex-col">
-        <div className="flex items-center gap-4">
+        <div className="flex items-center gap-4 h-full">
           <div className="text-center">
             <p className="text-3xl font-bold text-green-400">
               {formatNumber(value)}

app/components/ui/progress.tsx

@@ -6,7 +6,27 @@ import { cn, formatNumber } from "~/lib/utils"
 const Progress = React.forwardRef<
   React.ElementRef<typeof ProgressPrimitive.Root>,
   React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root>
->(({ className, value, ...props }, ref) => (
+>(({ className, value, ...props }, ref) => {
+  // Dynamic scaling logic based on value ranges
+  const getScaledValue = (inputValue: number) => {
+    const numValue = Number(inputValue);
+    if (numValue <= 1) {
+      return numValue * 100;
+    }
+   else  if (numValue <= 10) {
+      return (numValue / 10) * 100;
+    } else if (numValue <= 50) {
+      return (numValue / 50) * 100;
+    }
+    else {
+      return numValue
+    }
+  };
+
+  const scaledValue = getScaledValue(Number(value) || 0);
+  const displayValue = Number(value) || 0;
+
+  return (
     <ProgressPrimitive.Root
       ref={ref}
       className={cn(
@@ -16,14 +36,16 @@ const Progress = React.forwardRef<
       {...props}
     >
       <span className="left-0 text-sm absolute z-10 px-2 text-[#5F6284]">۰%</span>
-    <span className="w-full right-0 text-sm absolute z-10 px-2  text-[#5F6284]"
+      <span className="w-full right-0 text-sm absolute z-10 px-2 text-[#5F6284]">
-    >{formatNumber(Math.ceil(value || 0 * 10) / 10)}%</span>
+        {formatNumber(displayValue.toFixed(2))}%
+      </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 z-20"
-      style={{ transform: `translateX(-${15 - (value || 0)}%)` }}
+        style={{ transform: `translateX(-${100-scaledValue}%)` }}
       />
     </ProgressPrimitive.Root>
-))
+  )
+})
 Progress.displayName = ProgressPrimitive.Root.displayName
 
 export { Progress }

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,
       )}

app/components/ui/tooltip.tsx

@@ -52,7 +52,7 @@ function TooltipContent({
         {...props}
       >
         {children}
-        <TooltipPrimitive.Arrow className="bg-primary fill-primary z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px]" />
+        <TooltipPrimitive.Arrow className={cn("bg-primary fill-primary z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px]",className)} />
       </TooltipPrimitive.Content>
     </TooltipPrimitive.Portal>
   )

app/hooks/useStoredDate.tsx

@@ -0,0 +1,27 @@
+import jalaali from "jalaali-js";
+import { useEffect, useState } from "react";
+import type { CalendarDate } from "~/types/util.type";
+
+const { jy } = jalaali.toJalaali(new Date());
+
+export function useStoredDate(): [
+  CalendarDate,
+  React.Dispatch<React.SetStateAction<CalendarDate>>,
+] {
+  const [date, setDate] = useState<CalendarDate>({});
+
+  useEffect(() => {
+    const storedDate = localStorage.getItem("dateSelected");
+
+    if (storedDate) {
+      setDate(JSON.parse(storedDate));
+    } else {
+      setDate({
+        start: `${jy}/01/01`,
+        end: `${jy}/12/30`,
+      });
+    }
+  }, [jy]);
+
+  return [date, setDate];
+}

app/lib/api.ts

@@ -162,10 +162,24 @@ class ApiService {
 
   // Innovation process function call wrapper
   public async call<T = any>(payload: any) {
+    //بندر امام
     const url = "https://inogen-back.pelekan.org/api/call";
+    //آپادانا
+    const url = "https://APADANA-IATM-back.pelekan.org/api/call";
+    //نوری
+    const url = "https://NOPC-IATM-back.pelekan.org/api/call";
     return this.postAbsolute<T>(url, payload);
   }
 
+
+  const API_BASE_URL =
+  //بندر امام
+  // import.meta.env.VITE_API_URL || "https://inogen-bpms-back.pelekan.org/api";
+  //آپادانا
+  import.meta.env.VITE_API_URL || "https://APADANA-IATM-back.pelekan.org/api";
+  //نوری
+  // import.meta.env.VITE_API_URL || "https://NOPC-IATM-back.pelekan.org/api";
+
   // GET request
   public async get<T = any>(endpoint: string): Promise<ApiResponse<T>> {
     return this.request<T>(endpoint, {

app/lib/utils.ts

@@ -1,6 +1,7 @@
 import { clsx, type ClassValue } from "clsx";
-import { twMerge } from "tailwind-merge";
+import EventEmitter from "events";
 import moment from "moment-jalaali";
+import { twMerge } from "tailwind-merge";
 
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
@@ -22,8 +23,6 @@ export const formatCurrency = (amount: string | number) => {
   return new Intl.NumberFormat("fa-IR").format(numericAmount) + " ریال";
 };
 
-
-
 /**
  * محاسبه دامنه nice numbers برای محور Y نمودارها
  * @param values آرایه از مقادیر داده‌ها
@@ -132,4 +131,6 @@ moment.loadPersian({ usePersianDigits: true });
     return val.toString().replace(/\d/g, (d) => "۰۱۲۳۴۵۶۷۸۹"[+d]);
   }
   return val;
-}
+};
+
+export const EventBus = new EventEmitter();

app/routes/ecosystem.tsx

@@ -1,28 +1,33 @@
-import type { Route } from "./+types/ecosystem";
+import moment from "moment-jalaali";
 import React from "react";
 import { ProtectedRoute } from "~/components/auth/protected-route";
 import { DashboardLayout } from "~/components/dashboard/layout";
-import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
+import { InfoPanel } from "~/components/ecosystem/info-panel";
+import { NetworkGraph } from "~/components/ecosystem/network-graph";
+import { Card, CardContent } from "~/components/ui/card";
 import {
   Dialog,
   DialogContent,
-  DialogDescription,
   DialogHeader,
   DialogTitle,
 } from "~/components/ui/dialog";
-import { NetworkGraph } from "~/components/ecosystem/network-graph";
-import { InfoPanel } from "~/components/ecosystem/info-panel";
 import { useAuth } from "~/contexts/auth-context";
-import moment from "moment-jalaali";
+import type { Route } from "./+types/ecosystem";
 
 // Get API base URL at module level to avoid process.env access in browser
 const API_BASE_URL =
-  import.meta.env.VITE_API_URL || "https://inogen-back.pelekan.org/api";
+//بندر امام
+// import.meta.env.VITE_API_URL || "https://inogen-back.pelekan.org/api";
+//آپادانا
+import.meta.env.VITE_API_URL || "https://APADANA-IATM-back.pelekan.org/api";
+//نوری
+// import.meta.env.VITE_API_URL || "https://NOPC-IATM-back.pelekan.org/api";
+
+
 
 // Import the CompanyDetails type
-import type { CompanyDetails } from "~/components/ecosystem/network-graph";
-import { formatNumber } from "~/lib/utils";
 import { Hexagon } from "lucide-react";
+import type { CompanyDetails } from "~/components/ecosystem/network-graph";
 
 export function meta({}: Route.MetaArgs) {
   return [
@@ -89,7 +94,10 @@ export default function EcosystemPage() {
             <div className="lg:col-span-8 h-full">
               <Card className="h-full overflow-hidden bg-transparent border-[#3F415A]">
                 <CardContent className="p-0 h-full bg-transparent">
-                  <NetworkGraph onNodeClick={handleNodeClick} onLoadingChange={handleLoadingChange} />
+                  <NetworkGraph
+                    onNodeClick={handleNodeClick}
+                    onLoadingChange={handleLoadingChange}
+                  />
                 </CardContent>
               </Card>
             </div>
@@ -225,7 +233,9 @@ export default function EcosystemPage() {
                           <span className="text-right min-w-1/3">
                             <span className="font-persian text-sm font-normal text-right">
                               {handleValue(field.V)}
-                                                     {field.U && <span className="mr-1">({field.U})</span>}
+                              {field.U && (
+                                <span className="mr-1">({field.U})</span>
+                              )}
                             </span>
                           </span>
                         </div>

app/types/util.type.ts

@@ -0,0 +1,6 @@
+export interface CalendarDate {
+  start?: string;
+  end?: string;
+  sinceMonth?: string;
+  untilMonth?: string;
+}

package.json

@@ -26,6 +26,7 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "d3": "^7.9.0",
+    "file-saver": "^2.0.5",
     "graphology": "^0.26.0",
     "isbot": "^5.1.27",
     "lucide-react": "^0.525.0",
@@ -35,11 +36,13 @@
     "react-hot-toast": "^2.5.2",
     "react-router": "^7.7.0",
     "recharts": "^2.15.4",
-    "tailwind-merge": "^3.3.1"
+    "tailwind-merge": "^3.3.1",
+    "xlsx-js-style": "^1.2.0"
   },
   "devDependencies": {
     "@react-router/dev": "^7.7.0",
     "@tailwindcss/vite": "^4.1.4",
+    "@types/file-saver": "^2.0.7",
     "@types/node": "^20",
     "@types/react": "^19.1.2",
     "@types/react-dom": "^19.1.2",