From f0ce1e30fbd1a87b62ece5f6eb00223b984d65c5 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Tue, 30 Sep 2025 18:03:49 +0530
Subject: [PATCH 1/2] =?UTF-8?q?Add=20=E2=80=9COrganization=20Type=E2=80=9D?=
 =?UTF-8?q?=20Column=20in=20Project=20>=20Organization=20Page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectAssignedOrgs.jsx                    | 18 ++++++++++--------
 src/hooks/useProjectAccess.js                  |  3 +--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/components/Project/ProjectOrganization/ProjectAssignedOrgs.jsx b/src/components/Project/ProjectOrganization/ProjectAssignedOrgs.jsx
index 97f54cf0..1a15955e 100644
--- a/src/components/Project/ProjectOrganization/ProjectAssignedOrgs.jsx
+++ b/src/components/Project/ProjectOrganization/ProjectAssignedOrgs.jsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { useProjectAssignedOrganizations } from "../../../hooks/useProjects";
 import { useSelectedProject } from "../../../slices/apiDataManager";
+import { formatUTCToLocalTime } from "../../../utils/dateUtils";
 
 const ProjectAssignedOrgs = () => {
   const selectedProject = useSelectedProject();
@@ -47,24 +48,25 @@ const ProjectAssignedOrgs = () => {
       ),
       align: "text-center",
     },
-    {
-      key: "isActive",
-      label: "Status",
+   {
+      key: "assignedDate",
+      label: "Assigned Date",
       getValue: (org) => (
         <span
-          className={`text-truncate d-inline-block badge bg-label-${org.isActive ? "primary" :"secondary"}`}
-          style={{ maxWidth: "80px" }}
+          className="text-truncate d-inline-block"
+          style={{ maxWidth: "200px" }}
         >
-          {org?.isActive ? "Active" : "Inactive"}
+          {/* {org?.assignedDate || "N/A"} */}
+          {formatUTCToLocalTime(org?.assignedDate)}
         </span>
       ),
-      align: "text-start",
+      align: "text-center",
     },
   ];
 
   if (isLoading) return <div>Loading...</div>;
   if (isError) return <div>{error.message}</div>;
-
+  
   return (
     <div>
       <div className="dataTables_wrapper no-footer mx-5 pb-2 page">
diff --git a/src/hooks/useProjectAccess.js b/src/hooks/useProjectAccess.js
index 8449df82..6a3f5c67 100644
--- a/src/hooks/useProjectAccess.js
+++ b/src/hooks/useProjectAccess.js
@@ -14,8 +14,7 @@ export const useProjectAccess = (projectId) => {
   const canView = useHasUserPermission(VIEW_PROJECTS); 
 
   const loading = isLoading || !isFetched;
-   debugger
-  useEffect(() => {
+     useEffect(() => {
     if (projectId && !loading && !canView) {
       showToast("You don't have permission to view project details", "warning");
       navigate("/projects");
-- 
2.43.0


From 465c42f18cd681e6b69a143c1c23c3ff33633ff3 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Tue, 30 Sep 2025 18:23:56 +0530
Subject: [PATCH 2/2] =?UTF-8?q?Add=20=E2=80=9COrganization=20Type=E2=80=9D?=
 =?UTF-8?q?=20Column=20in=20Project=20>=20Organization=20Page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectAssignedOrgs.jsx                   | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/Project/ProjectOrganization/ProjectAssignedOrgs.jsx b/src/components/Project/ProjectOrganization/ProjectAssignedOrgs.jsx
index 1a15955e..6254c24c 100644
--- a/src/components/Project/ProjectOrganization/ProjectAssignedOrgs.jsx
+++ b/src/components/Project/ProjectOrganization/ProjectAssignedOrgs.jsx
@@ -25,12 +25,12 @@ const ProjectAssignedOrgs = () => {
       ),
       align: "text-start",
     },
-      {
+    {
       key: "service",
       label: "Service Name",
       getValue: (org) => (
         <div className="d-flex gap-2 py-1 ">
-        {org?.service?.name}
+          {org?.service?.name}
         </div>
       ),
       align: "text-start",
@@ -48,7 +48,20 @@ const ProjectAssignedOrgs = () => {
       ),
       align: "text-center",
     },
-   {
+    {
+      key: "organizationType",
+      label: "Organization Type",
+      getValue: (org) => (
+        <span
+          className="text-truncate d-inline-block"
+          style={{ maxWidth: "200px" }}
+        >
+          {org?.organizationType || "N/A"}
+        </span>
+      ),
+      align: "text-center",
+    },
+    {
       key: "assignedDate",
       label: "Assigned Date",
       getValue: (org) => (
@@ -56,17 +69,17 @@ const ProjectAssignedOrgs = () => {
           className="text-truncate d-inline-block"
           style={{ maxWidth: "200px" }}
         >
-          {/* {org?.assignedDate || "N/A"} */}
           {formatUTCToLocalTime(org?.assignedDate)}
         </span>
       ),
       align: "text-center",
     },
+
   ];
 
   if (isLoading) return <div>Loading...</div>;
   if (isError) return <div>{error.message}</div>;
-  
+  console.log("kartik", data)
   return (
     <div>
       <div className="dataTables_wrapper no-footer mx-5 pb-2 page">
-- 
2.43.0