Compare commits

...

22 Commits

Author SHA1 Message Date
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
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
4350a1f1aa Creating a custom hook for ImageGallery to call an API. 2025-07-14 12:29:58 +05:30
7558cbf8c4 Implementing a paste functionality in OTP login where the user can directly paste the OTP. 2025-07-14 12:29:58 +05:30
3fa5a2ba45 Changes in Date picker . 2025-07-14 12:29:58 +05:30
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
db60da45d9 In filter DatePicker should not display dates in Image Gallery. 2025-07-14 12:29:58 +05:30
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
75dfe1f6aa Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned. 2025-07-14 12:29:58 +05:30
25ff406b87 Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned. 2025-07-14 12:29:58 +05:30
e26fafeba3 Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 12:29:27 +05:30
e2eaced0ea Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 12:29:27 +05:30
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
b659dbd9ea Sizing for the projects directory has been corrected. 2025-07-14 12:29:27 +05:30
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
63c6d74434 On Change Password popup cross button is now working on click on it. 2025-07-14 12:28:21 +05:30
f0ab6efb36 Increase the size of Tabs text in Attendance and Projects. 2025-07-14 12:28:21 +05:30
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
bb32c3925d Assigned Task Should Be Visible to Normal User Without Showing Assign Button. 2025-07-14 12:28:21 +05:30
f7ea1aa60a Saved Username and Password Not Visible on Login Page Load 2025-07-14 12:27:53 +05:30
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
09e7ba3695 Image Popup Expands Page Width when add lengthy comment on Click in Image Gallery. 2025-07-14 12:27:53 +05:30
2 changed files with 127 additions and 109 deletions

View File

@ -81,9 +81,22 @@ const ProjectDetails = () => {
switch (activePill) { switch (activePill) {
case "profile": { case "profile": {
return ( return (
<div className="row"> <>
<div className="col-xl-4 col-lg-5 col-md-5 mt-5"> <div className="row ">
<AboutProject ></AboutProject> <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>
<div className="col-xl-4 col-lg-5 col-md-5 mt-5"> <div className="col-xl-4 col-lg-5 col-md-5 mt-5">
<ProjectOverview project={projectId} /> <ProjectOverview project={projectId} />
@ -123,8 +136,8 @@ const ProjectDetails = () => {
} }
case "directory": { case "directory": {
return ( return (
<div className="row"> <div className="row mt-2">
<Directory IsPage={false} prefernceContacts={projects_Details.id} /> <Directory IsPage={false} prefernceContacts={projectDetails.id} />
</div> </div>
); );
} }

View File

@ -263,111 +263,116 @@ const ProjectList = () => {
<p className="text-center text-muted">No projects found.</p> <p className="text-center text-muted">No projects found.</p>
)} )}
{listView ? ( {listView ? (
<div className="card cursor-pointer"> <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"> <table className="table m-3">
<thead> <thead>
<tr> <tr>
<th className="text-start" colSpan={5} > <th className="text-start" colSpan={5}>
Project Name Project Name
</th> </th>
<th className="mx-2 text-start">Contact Person</th> <th className="mx-2 text-start">Contact Person</th>
<th className="mx-2">START DATE</th> <th className="mx-2">START DATE</th>
<th className="mx-2">DEADLINE</th> <th className="mx-2">DEADLINE</th>
<th className="mx-2">Task</th> <th className="mx-2">Task</th>
<th className="mx-2">Progress</th> <th className="mx-2">Progress</th>
<th className="mx-2"> <th className="mx-2">
<div className="dropdown"> <div className="dropdown">
<a <a
className="dropdown-toggle hide-arrow cursor-pointer" className="dropdown-toggle hide-arrow cursor-pointer"
data-bs-toggle="dropdown" data-bs-toggle="dropdown"
aria-expanded="false" aria-expanded="false"
> >
Status <i className="bx bx-filter bx-sm"></i> Status <i className="bx bx-filter bx-sm"></i>
</a> </a>
<ul className="dropdown-menu p-2 text-capitalize"> <ul className="dropdown-menu p-2 text-capitalize">
{[ {[
{ {
id: "b74da4c2-d07e-46f2-9919-e75e49b12731", id: "b74da4c2-d07e-46f2-9919-e75e49b12731",
label: "Active", label: "Active",
}, },
{ {
id: "cdad86aa-8a56-4ff4-b633-9c629057dfef", id: "603e994b-a27f-4e5d-a251-f3d69b0498ba",
label:"In Progress" label: "On Hold",
}, },
{ {
id: "603e994b-a27f-4e5d-a251-f3d69b0498ba", id: "ef1c356e-0fe0-42df-a5d3-8daee355492d",
label: "On Hold", label: "Inactive",
}, },
{ {
id: "ef1c356e-0fe0-42df-a5d3-8daee355492d", id: "33deaef9-9af1-4f2a-b443-681ea0d04f81",
label: "Inactive", label: "Completed",
}, },
{ ].map(({ id, label }) => (
id: "33deaef9-9af1-4f2a-b443-681ea0d04f81", <li key={id}>
label: "Completed", <div className="form-check">
}, <input
].map(({ id, label }) => ( className="form-check-input"
<li key={id}> type="checkbox"
<div className="form-check"> checked={selectedStatuses.includes(id)}
<input onChange={() => handleStatusChange(id)}
className="form-check-input " />
type="checkbox" <label className="form-check-label">{label}</label>
checked={selectedStatuses.includes(id)}
onChange={() => handleStatusChange(id)}
/>
<label className="form-check-label">
{label}
</label>
</div>
</li>
))}
</ul>
</div> </div>
</th> </li>
<th ))}
className={`mx-2 ${ </ul>
HasManageProject ? "d-sm-table-cell" : "d-none" </div>
}`} </th>
> <th
Action className={`mx-2 ${
</th> HasManageProject ? "d-sm-table-cell" : "d-none"
</tr> }`}
</thead> >
<tbody className="table-border-bottom-0 overflow-auto "> Action
{currentItems.length === 0 ? ( </th>
<tr className="text-center"> </tr>
<td colSpan="12" rowSpan='12'style={{height:"200px"}} > </thead>
No projects found <tbody className="table-border-bottom-0" style={{ height: "200px" }}>
</td> {currentItems.length === 0 ? (
</tr> <tr>
) : ( <td
currentItems.map((project) => ( colSpan="12"
<ProjectListView className="text-center"
key={project.id} style={{
projectData={project} verticalAlign: "middle",
recall={sortingProject} height: "200px",
/> paddingTop: 0,
)) paddingBottom: 0,
)} }}
</tbody> >
</table> <div className="d-flex flex-column justify-content-center align-items-center h-100">
</div>{" "} <p className="mb-0">No projects found</p>
</div>{" "} </div>
</div> </td>
) : ( </tr>
<div className="row"> ) : (
{currentItems.map((project) => ( currentItems.map((project) => (
<ProjectCard <ProjectListView
key={project.id} key={project.id}
projectData={project} projectData={project}
recall={sortingProject} recall={sortingProject}
/> />
))} ))
</div> )}
)} </tbody>
</table>
</div>
</div>
</div>
) : (
<div className="row">
{currentItems.map((project) => (
<ProjectCard
key={project.id}
projectData={project}
recall={sortingProject}
/>
))}
</div>
)}
{!loading && totalPages > 1 && ( {!loading && totalPages > 1 && (
<nav> <nav>