hide relase date column when active employee and modified column name of role to project role #74

Merged
vikas.nale merged 1 commits from pramod_Bug#189 into Issue_May_2W 2025-05-08 05:37:06 +00:00

View File

@ -25,6 +25,7 @@ const Teams = ({ project }) => {
const [removingEmployeeId, setRemovingEmployeeId] = useState(null); const [removingEmployeeId, setRemovingEmployeeId] = useState(null);
const [assignedLoading, setAssignedLoading] = useState(false); const [assignedLoading, setAssignedLoading] = useState(false);
const [ employeeLodaing, setEmployeeLoading ] = useState( false ); const [ employeeLodaing, setEmployeeLoading ] = useState( false );
const [activeEmployee,setActiveEmployee] = useState(true)
const navigate = useNavigate(); const navigate = useNavigate();
@ -129,10 +130,13 @@ const Teams = ({ project }) => {
const handleFilterEmployee = (e) => { const handleFilterEmployee = (e) => {
const filterValue = e.target.value; const filterValue = e.target.value;
if (filterValue === "true") { if ( filterValue === "true" )
{
setActiveEmployee(true)
setFilteredEmployees(employees.filter((emp) => emp.isActive)); setFilteredEmployees(employees.filter((emp) => emp.isActive));
} else { } else {
setFilteredEmployees( employees.filter( ( emp ) => !emp.isActive ) ); setFilteredEmployees( employees.filter( ( emp ) => !emp.isActive ) );
setActiveEmployee(false)
} }
}; };
@ -200,8 +204,8 @@ const Teams = ({ project }) => {
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>Assigned Date</th> <th>Assigned Date</th>
<th>Release Date</th> {!activeEmployee && <th>Release Date</th>}
<th>Role</th> <th>Project Role</th>
<th>Actions</th> <th>Actions</th>
</tr> </tr>
</thead> </thead>
@ -236,13 +240,13 @@ const Teams = ({ project }) => {
"DD-MMM-YYYY" "DD-MMM-YYYY"
)}{" "} )}{" "}
</td> </td>
<td> {!activeEmployee && <td>
{item.reAllocationDate {item.reAllocationDate
? moment(item.reAllocationDate).format( ? moment(item.reAllocationDate).format(
"DD-MMM-YYYY" "DD-MMM-YYYY"
) )
: "Present"} : "Present"}
</td> </td>}
<td> <td>
<span className="badge bg-label-primary me-1"> <span className="badge bg-label-primary me-1">
{getRole(item.jobRoleId)} {getRole(item.jobRoleId)}