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

In the Date Range Picker, users should not be able to select any date in the future; future dates must be disabled.
Creating a custom hook for ImageGallery to call an API.
2025-07-14 12:39:07 +05:30 · 2025-07-14 12:29:59 +05:30 · 2025-07-14 12:29:58 +05:30 · 2025-07-14 12:29:58 +05:30 · 2025-07-14 12:29:58 +05:30 · 2025-07-14 12:29:58 +05:30
2 changed files with 127 additions and 109 deletions
--- a/src/pages/project/ProjectDetails.jsx
+++ b/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">
-              <AboutProject ></AboutProject>
+          <>
+            <div className="row ">
+              <div className="col-lg-4 col-md-5 mt-5">
+                {/* 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">
-            <Directory IsPage={false} prefernceContacts={projects_Details.id} />
+          <div className="row mt-2">
+            <Directory IsPage={false} prefernceContacts={projectDetails.id} />
          </div>
        );
      }
--- a/src/pages/project/ProjectList.jsx
+++ b/src/pages/project/ProjectList.jsx
@ -265,12 +265,12 @@ const ProjectList = () => {

       {listView ? (
  <div className="card cursor-pointer">
-            <div className="card-body p-2">
-              <div className="table-responsive text-nowrap py-2 " style={{minHeight:"400px"}}>
+    <div className="card-body p-2" style={{ minHeight: "200px" }}>
+      <div className="table-responsive text-nowrap py-2">
        <table className="table m-3">
          <thead>
            <tr>
-                      <th className="text-start" colSpan={5} >
+              <th className="text-start" colSpan={5}>
                Project Name
              </th>
              <th className="mx-2 text-start">Contact Person</th>
@ -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",
@ -313,14 +309,12 @@ const ProjectList = () => {
                      <li key={id}>
                        <div className="form-check">
                          <input
-                                    className="form-check-input  "
+                            className="form-check-input"
                            type="checkbox"
                            checked={selectedStatuses.includes(id)}
                            onChange={() => handleStatusChange(id)}
                          />
-                                  <label className="form-check-label">
-                                    {label}
-                                  </label>
+                          <label className="form-check-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">
-                        <td colSpan="12" rowSpan='12'style={{height:"200px"}} >
-                          No projects found
+              <tr>
+                <td
+                  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,10 +359,10 @@ const ProjectList = () => {
            )}
          </tbody>
        </table>
-              </div>{" "}
-            </div>{" "}
      </div>
-        ) : (
+    </div>
+  </div>
+) : (
  <div className="row">
    {currentItems.map((project) => (
      <ProjectCard
@ -367,7 +372,7 @@ const ProjectList = () => {
      />
    ))}
  </div>
-        )}
+)}

 {!loading && totalPages > 1 && (
  <nav>
Author	SHA1	Message	Date
pramod mahajan	bca930fb3c	Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W	2025-07-14 12:39:07 +05:30
Kartik sharma	6125d48119	In the Date Range Picker, users should not be able to select any date in the future; future dates must be disabled.	2025-07-14 12:29:59 +05:30
Kartik sharma	4350a1f1aa	Creating a custom hook for ImageGallery to call an API.	2025-07-14 12:29:58 +05:30
Kartik sharma	7558cbf8c4	Implementing a paste functionality in OTP login where the user can directly paste the OTP.	2025-07-14 12:29:58 +05:30
Kartik sharma	3fa5a2ba45	Changes in Date picker .	2025-07-14 12:29:58 +05:30
Kartik sharma	2f37dba1a2	In the Image Gallery, the filter drawer's date picker should default to the last 7 days (today minus 7 days).	2025-07-14 12:29:58 +05:30
Kartik sharma	db60da45d9	In filter DatePicker should not display dates in Image Gallery.	2025-07-14 12:29:58 +05:30
Kartik sharma	a3f24af524	In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes.	2025-07-14 12:29:58 +05:30
Kartik sharma	75dfe1f6aa	Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.	2025-07-14 12:29:58 +05:30
Kartik sharma	25ff406b87	Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned.	2025-07-14 12:29:58 +05:30
Kartik sharma	e26fafeba3	Ensure all pages maintain a consistent size, even when there's less data to display.	2025-07-14 12:29:27 +05:30
Kartik sharma	e2eaced0ea	Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report.	2025-07-14 12:29:27 +05:30
Kartik sharma	386c98bdc3	Increase the size of table in Projects Directory and show text in center and add 200 px height.	2025-07-14 12:29:27 +05:30
Kartik sharma	b659dbd9ea	Sizing for the projects directory has been corrected.	2025-07-14 12:29:27 +05:30
Kartik sharma	117dae81e4	UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects.	2025-07-14 12:28:21 +05:30
Kartik sharma	63c6d74434	On Change Password popup cross button is now working on click on it.	2025-07-14 12:28:21 +05:30
Kartik sharma	f0ab6efb36	Increase the size of Tabs text in Attendance and Projects.	2025-07-14 12:28:21 +05:30
Kartik sharma	fc8a3ce109	There's an issue: Today's Attendance, when I went to page 2 and then changed the project, all the data was lost."	2025-07-14 12:28:21 +05:30
Kartik sharma	bb32c3925d	Assigned Task Should Be Visible to Normal User Without Showing Assign Button.	2025-07-14 12:28:21 +05:30
Kartik sharma	f7ea1aa60a	Saved Username and Password Not Visible on Login Page Load	2025-07-14 12:27:53 +05:30
Kartik sharma	59190cf086	Adding pagination 20 in Profile Attendance page and adding condtion to show more then 20 records to show paging.	2025-07-14 12:27:53 +05:30
Kartik sharma	09e7ba3695	Image Popup Expands Page Width when add lengthy comment on Click in Image Gallery.	2025-07-14 12:27:53 +05:30