Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W

src/pages/project/ProjectDetails.jsx

@@ -81,9 +81,22 @@ const ProjectDetails = () => {
     switch (activePill) {
       case "profile": {
         return (
+          <>
             <div className="row ">
-            <div className="col-xl-4 col-lg-5 col-md-5 mt-5">
+              <div className="col-lg-4 col-md-5 mt-5">
-              <AboutProject ></AboutProject>
+                {/* About User */}
+                <AboutProject data={projectDetails}></AboutProject>
+                <ProjectOverview project={projectId} />
+                {/* About User */}
+              </div>
+              <div className="col-lg-8 col-md-5  mt-5">
+                {/* Profile Overview */}
+                <ProjectProgressChart
+                  ShowAllProject="false"
+                  DefaultRange="1M"
+                />
+                {/* Profile Overview */}
+              </div>
             </div>
             <div className="col-xl-4 col-lg-5 col-md-5  mt-5">
               <ProjectOverview project={projectId} />
@@ -123,8 +136,8 @@ const ProjectDetails = () => {
       }
       case "directory": {
         return (
-          <div className="row">
+          <div className="row mt-2">
-            <Directory IsPage={false} prefernceContacts={projects_Details.id} />
+            <Directory IsPage={false} prefernceContacts={projectDetails.id} />
           </div>
         );
       }

src/pages/project/ProjectList.jsx

@@ -265,8 +265,8 @@ const ProjectList = () => {
 
        {listView ? (
   <div className="card cursor-pointer">
-            <div className="card-body p-2">
+    <div className="card-body p-2" style={{ minHeight: "200px" }}>
-              <div className="table-responsive text-nowrap py-2 " style={{minHeight:"400px"}}>
+      <div className="table-responsive text-nowrap py-2">
         <table className="table m-3">
           <thead>
             <tr>
@@ -293,10 +293,6 @@ const ProjectList = () => {
                         id: "b74da4c2-d07e-46f2-9919-e75e49b12731",
                         label: "Active",
                       },
-                              {
-                                id: "cdad86aa-8a56-4ff4-b633-9c629057dfef",
-                                label:"In Progress"
-                               },
                       {
                         id: "603e994b-a27f-4e5d-a251-f3d69b0498ba",
                         label: "On Hold",
@@ -318,9 +314,7 @@ const ProjectList = () => {
                             checked={selectedStatuses.includes(id)}
                             onChange={() => handleStatusChange(id)}
                           />
-                                  <label className="form-check-label">
+                          <label className="form-check-label">{label}</label>
-                                    {label}
-                                  </label>
                         </div>
                       </li>
                     ))}
@@ -336,11 +330,22 @@ const ProjectList = () => {
               </th>
             </tr>
           </thead>
-                  <tbody className="table-border-bottom-0 overflow-auto ">
+          <tbody className="table-border-bottom-0" style={{ height: "200px" }}>
             {currentItems.length === 0 ? (
-                      <tr className="text-center">
+              <tr>
-                        <td colSpan="12" rowSpan='12'style={{height:"200px"}} >
+                <td
-                          No projects found
+                  colSpan="12"
+                  className="text-center"
+                  style={{
+                    verticalAlign: "middle",
+                    height: "200px",
+                    paddingTop: 0,
+                    paddingBottom: 0,
+                  }}
+                >
+                  <div className="d-flex flex-column justify-content-center align-items-center h-100">
+                    <p className="mb-0">No projects found</p>
+                  </div>
                 </td>
               </tr>
             ) : (
@@ -354,8 +359,8 @@ const ProjectList = () => {
             )}
           </tbody>
         </table>
-              </div>{" "}
+      </div>
-            </div>{" "}
+    </div>
   </div>
 ) : (
   <div className="row">