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

@ -265,12 +265,12 @@ const ProjectList = () => {
{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>
@ -293,6 +293,10 @@ const ProjectList = () => {
id: "b74da4c2-d07e-46f2-9919-e75e49b12731", id: "b74da4c2-d07e-46f2-9919-e75e49b12731",
label: "Active", label: "Active",
}, },
{
id: "cdad86aa-8a56-4ff4-b633-9c629057dfef",
label:"In Progress"
},
{ {
id: "603e994b-a27f-4e5d-a251-f3d69b0498ba", id: "603e994b-a27f-4e5d-a251-f3d69b0498ba",
label: "On Hold", label: "On Hold",
@ -309,12 +313,14 @@ const ProjectList = () => {
<li key={id}> <li key={id}>
<div className="form-check"> <div className="form-check">
<input <input
className="form-check-input" className="form-check-input "
type="checkbox" type="checkbox"
checked={selectedStatuses.includes(id)} checked={selectedStatuses.includes(id)}
onChange={() => handleStatusChange(id)} onChange={() => handleStatusChange(id)}
/> />
<label className="form-check-label">{label}</label> <label className="form-check-label">
{label}
</label>
</div> </div>
</li> </li>
))} ))}
@ -330,22 +336,11 @@ const ProjectList = () => {
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody className="table-border-bottom-0" style={{ height: "200px" }}> <tbody className="table-border-bottom-0 overflow-auto ">
{currentItems.length === 0 ? ( {currentItems.length === 0 ? (
<tr> <tr className="text-center">
<td <td colSpan="12" rowSpan='12'style={{height:"200px"}} >
colSpan="12" No projects found
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> </td>
</tr> </tr>
) : ( ) : (
@ -359,10 +354,10 @@ const ProjectList = () => {
)} )}
</tbody> </tbody>
</table> </table>
</div>{" "}
</div>{" "}
</div> </div>
</div> ) : (
</div>
) : (
<div className="row"> <div className="row">
{currentItems.map((project) => ( {currentItems.map((project) => (
<ProjectCard <ProjectCard
@ -372,7 +367,7 @@ const ProjectList = () => {
/> />
))} ))}
</div> </div>
)} )}
{!loading && totalPages > 1 && ( {!loading && totalPages > 1 && (
<nav> <nav>