Compare commits

..

No commits in common. "bca930fb3c54758b707a411e1e8725a763c69409" and "c12efe3061a0d0fcf8484c5bc46e5306d33dc8d9" have entirely different histories.

2 changed files with 109 additions and 127 deletions

View File

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

View File

@ -263,116 +263,111 @@ 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" style={{ minHeight: "200px" }}> <div className="card-body p-2">
<div className="table-responsive text-nowrap py-2"> <div className="table-responsive text-nowrap py-2 " style={{minHeight:"400px"}}>
<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: "603e994b-a27f-4e5d-a251-f3d69b0498ba", id: "cdad86aa-8a56-4ff4-b633-9c629057dfef",
label: "On Hold", label:"In Progress"
}, },
{ {
id: "ef1c356e-0fe0-42df-a5d3-8daee355492d", id: "603e994b-a27f-4e5d-a251-f3d69b0498ba",
label: "Inactive", label: "On Hold",
}, },
{ {
id: "33deaef9-9af1-4f2a-b443-681ea0d04f81", id: "ef1c356e-0fe0-42df-a5d3-8daee355492d",
label: "Completed", label: "Inactive",
}, },
].map(({ id, label }) => ( {
<li key={id}> id: "33deaef9-9af1-4f2a-b443-681ea0d04f81",
<div className="form-check"> label: "Completed",
<input },
className="form-check-input" ].map(({ id, label }) => (
type="checkbox" <li key={id}>
checked={selectedStatuses.includes(id)} <div className="form-check">
onChange={() => handleStatusChange(id)} <input
/> className="form-check-input "
<label className="form-check-label">{label}</label> type="checkbox"
checked={selectedStatuses.includes(id)}
onChange={() => handleStatusChange(id)}
/>
<label className="form-check-label">
{label}
</label>
</div>
</li>
))}
</ul>
</div> </div>
</li> </th>
))} <th
</ul> className={`mx-2 ${
</div> HasManageProject ? "d-sm-table-cell" : "d-none"
</th> }`}
<th >
className={`mx-2 ${ Action
HasManageProject ? "d-sm-table-cell" : "d-none" </th>
}`} </tr>
> </thead>
Action <tbody className="table-border-bottom-0 overflow-auto ">
</th> {currentItems.length === 0 ? (
</tr> <tr className="text-center">
</thead> <td colSpan="12" rowSpan='12'style={{height:"200px"}} >
<tbody className="table-border-bottom-0" style={{ height: "200px" }}> No projects found
{currentItems.length === 0 ? ( </td>
<tr> </tr>
<td ) : (
colSpan="12" currentItems.map((project) => (
className="text-center" <ProjectListView
style={{ key={project.id}
verticalAlign: "middle", projectData={project}
height: "200px", recall={sortingProject}
paddingTop: 0, />
paddingBottom: 0, ))
}} )}
> </tbody>
<div className="d-flex flex-column justify-content-center align-items-center h-100"> </table>
<p className="mb-0">No projects found</p> </div>{" "}
</div> </div>{" "}
</td> </div>
</tr> ) : (
) : ( <div className="row">
currentItems.map((project) => ( {currentItems.map((project) => (
<ProjectListView <ProjectCard
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>