diff --git a/app/components/dashboard/project-management/digital-innovation-page.tsx b/app/components/dashboard/project-management/digital-innovation-page.tsx index 7ce9d6a..e077d38 100644 --- a/app/components/dashboard/project-management/digital-innovation-page.tsx +++ b/app/components/dashboard/project-management/digital-innovation-page.tsx @@ -212,7 +212,7 @@ export function DigitalInnovationPage() { value: formatNumber(stats.reduceCosts.toFixed?.(1) ?? stats.reduceCosts), description: "میلیون ریال کاهش یافته", icon: , - color: "text-emerald-400", + color: "text-pr-green", }, { id: "bottleneck-removal", @@ -220,7 +220,7 @@ export function DigitalInnovationPage() { value: formatNumber(stats.increasedRevenue), description: "میلیون ریال افزایش یافته", icon: , - color: "text-emerald-400", + color: "text-pr-green", }, { @@ -231,7 +231,7 @@ export function DigitalInnovationPage() { ), description: "هزار تن صرفه جوریی شده", icon: , - color: "text-emerald-400", + color: "text-pr-green", }, { id: "frequent-failures-reduction", @@ -242,7 +242,7 @@ export function DigitalInnovationPage() { ), description: "مگاوات کاهش یافته", icon: , - color: "text-emerald-400", + color: "text-pr-green", }, ]; @@ -599,14 +599,18 @@ export function DigitalInnovationPage() { variant="ghost" size="sm" onClick={() => handleProjectDetails(item)} +<<<<<<< HEAD className="text-pr-green underline-offset-4 underline font-normal 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" +>>>>>>> a14faab82da07fc3009ec8503f8bf6b143633a4c > جزئیات بیشتر ); case "amount_currency_reduction": return ( - + {formatCurrency(String(value))} ); @@ -617,7 +621,9 @@ export function DigitalInnovationPage() { ); case "title": - return {String(value)}; + return ( + {String(value)} + ); case "project_status": return (
@@ -652,7 +658,7 @@ export function DigitalInnovationPage() { return ( -
+
{/* Stats Cards */}
@@ -709,7 +715,7 @@ export function DigitalInnovationPage() {

{card.value}

@@ -725,7 +731,7 @@ export function DigitalInnovationPage() {
{/* Process Impacts Chart */} - + {/* */} {/* Data Table */} - +
- +
{columns.map((column) => ( diff --git a/app/components/dashboard/project-management/green-innovation-page.tsx b/app/components/dashboard/project-management/green-innovation-page.tsx index 185a6b7..552ac01 100644 --- a/app/components/dashboard/project-management/green-innovation-page.tsx +++ b/app/components/dashboard/project-management/green-innovation-page.tsx @@ -602,14 +602,18 @@ export function GreenInnovationPage() { variant="ghost" size="sm" onClick={() => handleProjectDetails(item)} +<<<<<<< HEAD className="text-pr-green underline-offset-4 underline font-normal 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" +>>>>>>> a14faab82da07fc3009ec8503f8bf6b143633a4c > جزئیات بیشتر ); case "amount_currency_reduction": return ( - + {formatCurrency(String(value))} ); @@ -620,7 +624,9 @@ export function GreenInnovationPage() { ); case "title": - return {String(value)}; + return ( + {String(value)} + ); case "project_status": return (
@@ -733,7 +739,7 @@ export function GreenInnovationPage() {
- + % {value.percent?.value} @@ -742,7 +748,7 @@ export function GreenInnovationPage() {
- + {value.total?.value} @@ -1113,7 +1119,7 @@ export function GreenInnovationPage() { شرح پروژه -
+
{/* Project Description */}

{selectedProjectDetails?.title}

diff --git a/app/components/dashboard/project-management/innovation-built-inside-page.tsx b/app/components/dashboard/project-management/innovation-built-inside-page.tsx index 8ebc62f..fcdaf7b 100644 --- a/app/components/dashboard/project-management/innovation-built-inside-page.tsx +++ b/app/components/dashboard/project-management/innovation-built-inside-page.tsx @@ -152,8 +152,8 @@ enum projectStatus { const columns = [ { key: "select", label: "", sortable: false, width: "50px" }, - { key: "project_no", label: "شماره پروژه", sortable: true, width: "140px" }, - { key: "title", label: "عنوان پروژه", sortable: true, width: "400px" }, + { key: "project_no", label: "شماره پروژه", sortable: true, width: "120px" }, + { key: "title", label: "عنوان پروژه", sortable: true, width: "300px" }, { key: "project_status", label: "وضعیت پروژه", @@ -164,7 +164,7 @@ const columns = [ key: "project_rating", label: "امتیاز پروژه", sortable: true, - width: "140px", + width: "120px", }, { key: "details", label: "جزئیات پروژه", sortable: false, width: "140px" }, ]; @@ -624,14 +624,18 @@ export function InnovationBuiltInsidePage() { variant="ghost" size="sm" onClick={() => handleProjectDetails(item)} +<<<<<<< HEAD className="text-pr-green underline-offset-4 underline font-normal 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" +>>>>>>> a14faab82da07fc3009ec8503f8bf6b143633a4c > جزئیات بیشتر ); case "amount_currency_reduction": return ( - + {formatCurrency(String(value))} ); @@ -642,7 +646,9 @@ export function InnovationBuiltInsidePage() { ); case "title": - return {String(value)}; + return ( + {String(value)} + ); case "project_status": return (
@@ -701,10 +707,10 @@ export function InnovationBuiltInsidePage() { return ( -
+
{/* Stats Cards */} -
-
+
+
{statsLoading ? // Loading skeleton for stats cards - matching new design Array.from({ length: 2 }).map((_, index) => ( @@ -748,7 +754,7 @@ export function InnovationBuiltInsidePage() {
- + % {value.percent?.value} @@ -757,7 +763,7 @@ export function InnovationBuiltInsidePage() {
- + {value.total?.value} @@ -867,7 +873,7 @@ export function InnovationBuiltInsidePage() {
-
+
{columns.map((column) => ( @@ -1030,7 +1036,7 @@ export function InnovationBuiltInsidePage() { {/* Project Details Dialog */} - + شرح پروژه @@ -1092,7 +1098,6 @@ export function InnovationBuiltInsidePage() {
- {" "} سطح تکنولوژی
@@ -1256,7 +1261,7 @@ export function InnovationBuiltInsidePage() { ))} ) : ( - +