Refactor_Expenses #321

Merged
pramod.mahajan merged 249 commits from Refactor_Expenses into hotfix/MasterActivity 2025-08-01 13:14:59 +00:00
Showing only changes of commit 3925926084 - Show all commits

View File

@ -48,12 +48,6 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
const infoRef = useRef(null); const infoRef = useRef(null);
const infoRef1 = useRef(null); const infoRef1 = useRef(null);
// State for search term
const [searchTerm, setSearchTerm] = useState("");
// State for search term
const [searchTerm, setSearchTerm] = useState("");
useEffect(() => { useEffect(() => {
if (typeof bootstrap !== "undefined") { if (typeof bootstrap !== "undefined") {
if (infoRef.current) { if (infoRef.current) {
@ -89,10 +83,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
const { loading } = useMaster(); const { loading } = useMaster();
const { data: jobRoleData } = useMaster(); const { data: jobRoleData } = useMaster();
// Changed to an array to hold multiple selected roles const [selectedRole, setSelectedRole] = useState("all");
const [selectedRoles, setSelectedRoles] = useState(["all"]);
// Changed to an array to hold multiple selected roles
const [selectedRoles, setSelectedRoles] = useState(["all"]);
const [displayedSelection, setDisplayedSelection] = useState(""); const [displayedSelection, setDisplayedSelection] = useState("");
const { const {
handleSubmit, handleSubmit,
@ -130,81 +121,20 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
useEffect(() => { useEffect(() => {
dispatch(changeMaster("Job Role")); dispatch(changeMaster("Job Role"));
// Initial state should reflect "All Roles" selected
setSelectedRoles(["all"]); return () => setSelectedRole("all");
// Initial state should reflect "All Roles" selected
setSelectedRoles(["all"]);
}, [dispatch]); }, [dispatch]);
// Modified handleRoleChange to handle multiple selections const handleRoleChange = (event) => {
const handleRoleChange = (event, roleId) => { setSelectedRole(event.target.value);
// If 'all' is selected, clear other selections
if (roleId === "all") {
setSelectedRoles(["all"]);
} else {
setSelectedRoles((prevSelectedRoles) => {
// If "all" was previously selected, remove it
const newRoles = prevSelectedRoles.filter((role) => role !== "all");
if (newRoles.includes(roleId)) {
// If role is already selected, unselect it
return newRoles.filter((id) => id !== roleId);
} else {
// If role is not selected, add it
return [...newRoles, roleId];
}
});
}
}; };
useEffect(() => { const filteredEmployees =
// Update displayedSelection based on selectedRoles selectedRole === "all"
if (selectedRoles.includes("all")) { ? employees
setDisplayedSelection("All Roles"); : employees?.filter(
} else if (selectedRoles.length > 0) { (emp) => String(emp.jobRoleId || "") === selectedRole
const selectedRoleNames = selectedRoles.map(roleId => { );
const role = jobRoleData?.find(r => String(r.id) === roleId);
return role ? role.name : '';
}).filter(Boolean); // Filter out empty strings for roles not found
setDisplayedSelection(selectedRoleNames.join(', '));
} else {
setDisplayedSelection("Select Roles");
}
}, [selectedRoles, jobRoleData]);
const handleSearchChange = (event) => {
setSearchTerm(event.target.value);
};
// Filter employees first by role, then by search term AND job role name
const filteredEmployees = employees?.filter((emp) => {
const matchesRole =
selectedRoles.includes("all") || selectedRoles.includes(String(emp.jobRoleId));
// Convert both first and last names and job role name to lowercase for case-insensitive matching
const fullName = `${emp.firstName} ${emp.lastName}`.toLowerCase();
const jobRoleName = jobRoleData?.find((role) => role.id === emp.jobRoleId)?.name?.toLowerCase() || "";
const searchLower = searchTerm.toLowerCase();
// Check if the full name OR job role name includes the search term
const matchesSearch = fullName.includes(searchLower) || jobRoleName.includes(searchLower);
return matchesRole && matchesSearch;
});
// Determine unique job role IDs from the filtered employees (for dropdown options)
const uniqueJobRoleIdsInFilteredEmployees = new Set(
employees?.map(emp => emp.jobRoleId).filter(Boolean)
);
// Filter jobRoleData to only include roles present in the uniqueJobRoleIdsInFilteredEmployees
const jobRolesForDropdown = jobRoleData?.filter(role =>
uniqueJobRoleIdsInFilteredEmployees.has(role.id)
);
// Calculate the count of selected roles for display
const selectedRolesCount = selectedRoles.includes("all")
? 0 // "All Roles" doesn't contribute to a specific count
: selectedRoles.length;
const onSubmit = (data) => { const onSubmit = (data) => {
const selectedEmployeeIds = data.selectedEmployees; const selectedEmployeeIds = data.selectedEmployees;
@ -229,8 +159,6 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
reset(); reset();
onClose(); onClose();
}; };
return ( return (
<div className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap"> <div className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">
<p className="align-items-center flex-wrap m-0 ">Assign Task</p> <p className="align-items-center flex-wrap m-0 ">Assign Task</p>
@ -264,260 +192,118 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
<div className="form-text text-start"> <div className="form-text text-start">
<div className="d-flex align-items-center form-text fs-7"> <div className="d-flex align-items-center form-text fs-7">
<span className="text-dark">Select Team</span> <span className="text-dark">Select Team</span>
<div className="dropdown position-relative d-inline-block"> <div className="me-2">{displayedSelection}</div>
<a <a
className={`dropdown-toggle hide-arrow cursor-pointer ${selectedRoles.includes("all") || selectedRoles.length === 0 className="dropdown-toggle hide-arrow cursor-pointer"
? "text-secondary" data-bs-toggle="dropdown"
: "text-primary" aria-expanded="false"
}`}
data-bs-toggle="dropdown"
role="button"
aria-expanded="false"
>
<i className="bx bx-slider-alt ms-2"></i>
</a>
{/* Badge */}
{selectedRolesCount > 0 && (
<span
className="position-absolute top-0 start-100 translate-middle badge rounded-circle bg-warning text-white"
style={{
fontSize: "0.65rem",
minWidth: "18px",
height: "18px",
padding: "0",
lineHeight: "18px",
textAlign: "center",
zIndex: 10,
}}
>
{selectedRolesCount}
</span>
)}
{/* Dropdown Menu */}
<ul
className="dropdown-menu p-2 text-capitalize "
>
<li key="all">
<div className="form-check dropdown-item py-0">
<input
className="form-check-input"
type="checkbox"
id="checkboxAllRoles"
value="all"
checked={selectedRoles.includes("all")}
onChange={(e) => handleRoleChange(e, e.target.value)}
/>
<label className="form-check-label ms-2" htmlFor="checkboxAllRoles">
All Roles
</label>
</div>
</li>
{jobRolesForDropdown?.map((role) => (
<li key={role.id}>
<div className="form-check dropdown-item py-0">
<input
className="form-check-input"
type="checkbox"
id={`checkboxRole-${role.id}`}
value={role.id}
checked={selectedRoles.includes(String(role.id))}
onChange={(e) => handleRoleChange(e, e.target.value)}
/>
<label className="form-check-label ms-2" htmlFor={`checkboxRole-${role.id}`}>
{role.name}
</label>
</div>
</li>
))}
</ul>
</div>
<ul
className="dropdown-menu p-2 text-capitalize"
style={{ maxHeight: "300px", overflowY: "auto" }}
> >
<i className="bx bx-filter bx-lg text-primary"></i>
</a>
<ul className="dropdown-menu p-2 text-capitalize">
<li key="all"> <li key="all">
<div className="form-check dropdown-item py-0"> <button
<input type="button"
className="form-check-input" className="dropdown-item py-1"
type="checkbox" onClick={() =>
id="checkboxAllRoles" handleRoleChange({
value="all" target: { value: "all" },
checked={selectedRoles.includes("all")} })
onChange={(e) => }
handleRoleChange(e, e.target.value) >
} All Roles
/> </button>
<label
className="form-check-label ms-2"
htmlFor="checkboxAllRoles"
>
All Roles
</label>
</div>
<div className="form-check dropdown-item py-0">
<input
className="form-check-input"
type="checkbox"
id="checkboxAllRoles"
value="all"
checked={selectedRoles.includes("all")}
onChange={(e) =>
handleRoleChange(e, e.target.value)
}
/>
<label
className="form-check-label ms-2"
htmlFor="checkboxAllRoles"
>
All Roles
</label>
</div>
</li> </li>
{jobRolesForDropdown?.map((role) => ( {jobRoleData?.map((user) => (
<li key={role.id}> <li key={user.id}>
<div className="form-check dropdown-item py-0"> <button
<input type="button"
className="form-check-input" className="dropdown-item py-1"
type="checkbox" value={user.id}
id={`checkboxRole-${role.id}`} onClick={handleRoleChange}
value={role.id} >
checked={selectedRoles.includes(String(role.id))} {user.name}
onChange={(e) => </button>
handleRoleChange(e, e.target.value)
}
/>
<label
className="form-check-label ms-2"
htmlFor={`checkboxRole-${role.id}`}
>
{role.name}
</label>
</div>
{jobRolesForDropdown?.map((role) => (
<li key={role.id}>
<div className="form-check dropdown-item py-0">
<input
className="form-check-input"
type="checkbox"
id={`checkboxRole-${role.id}`}
value={role.id}
checked={selectedRoles.includes(String(role.id))}
onChange={(e) =>
handleRoleChange(e, e.target.value)
}
/>
<label
className="form-check-label ms-2"
htmlFor={`checkboxRole-${role.id}`}
>
{role.name}
</label>
</div>
</li> </li>
))} ))}
</ul> </ul>
<input
type="text"
className="form-control form-control-sm ms-auto mb-2 mt-2"
placeholder="Search employees or roles..."
value={searchTerm}
onChange={handleSearchChange}
style={{ maxWidth: '200px' }}
/>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div
className="col-12 mt-2"
style={{ maxHeight: "280px", overflowY: "auto", overflowX: "hidden" }}
>
{selectedRoles?.length > 0 && (
<div className="row">
{employeeLoading ? (
<div className="col-12">
<p className="text-center">Loading employees...</p>
</div>
) : filteredEmployees?.length > 0 ? (
filteredEmployees.map((emp) => {
const jobRole = jobRoleData?.find(
(role) => role?.id === emp?.jobRoleId
);
<div
className="col-12 mt-2"
style={{ maxHeight: "280px", overflowY: "auto", overflowX: "hidden" }}
>
{selectedRoles?.length > 0 && (
<div className="row">
{employeeLoading ? (
<div className="col-12">
<p className="text-center">Loading employees...</p>
</div>
) : filteredEmployees?.length > 0 ? (
filteredEmployees.map((emp) => {
const jobRole = jobRoleData?.find(
(role) => role?.id === emp?.jobRoleId
);
return ( <div className="row">
<div <div className="col-12 h-sm-25 overflow-auto mt-2">
key={emp.id} {selectedRole !== "" && (
className="col-6 col-md-4 col-lg-3 mb-3" <div className="row">
> {employeeLoading ? (
<div className="form-check d-flex align-items-start"> <div className="col-12">
<Controller <p className="text-center">Loading employees...</p>
name="selectedEmployees" </div>
control={control} ) : filteredEmployees?.length > 0 ? (
render={({ field }) => ( filteredEmployees.map((emp) => {
<input const jobRole = jobRoleData?.find(
{...field} (role) => role?.id === emp?.jobRoleId
className="form-check-input me-1 mt-1" );
type="checkbox"
id={`employee-${emp?.id}`} return (
value={emp.id} <div
checked={field.value?.includes(emp.id)} key={emp.id}
onChange={(e) => { className="col-6 col-md-4 col-lg-3 mb-3"
handleCheckboxChange(e, emp); >
}} <div className="form-check d-flex align-items-start">
/> <Controller
)} name="selectedEmployees"
/> control={control}
<div className="flex-grow-1"> render={({ field }) => (
<p <input
className="mb-0" {...field}
style={{ fontSize: "13px" }} className="form-check-input me-1 mt-1"
> type="checkbox"
{emp.firstName} {emp.lastName} id={`employee-${emp?.id}`}
</p> value={emp.id}
<small checked={field.value?.includes(emp.id)}
className="text-muted" onChange={(e) => {
style={{ fontSize: "11px" }} handleCheckboxChange(e, emp);
> }}
{loading ? ( />
<span className="placeholder-glow">
<span className="placeholder col-6"></span>
</span>
) : (
jobRole?.name || "Unknown Role"
)} )}
</small> />
<div className="flex-grow-1">
<p
className="mb-0"
style={{ fontSize: "13px" }}
>
{emp.firstName} {emp.lastName}
</p>
<small
className="text-muted"
style={{ fontSize: "11px" }}
>
{loading ? (
<span className="placeholder-glow">
<span className="placeholder col-6"></span>
</span>
) : (
jobRole?.name || "Unknown Role"
)}
</small>
</div>
</div> </div>
</div> </div>
</div> );
); })
}) ) : (
) : ( <div className="col-12">
<div className="col-12"> <p className="text-center">
<p className="text-center"> No employees found for the selected role.
No employees found for the selected role(s). </p>
</p> </div>
</div> )}
)} </div>
</div> )}
)} </div>
</div> </div>
<div <div
@ -646,15 +432,11 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
id="defaultFormControlInput" id="defaultFormControlInput"
aria-describedby="defaultFormControlHelp" aria-describedby="defaultFormControlHelp"
/> />
<span style={{ paddingLeft: "6px", whiteSpace: "nowrap" }}> <span style={{ paddingLeft: "6px" }}>
<u> { {
assignData?.workItem?.activityMaster assignData?.workItem?.workItem?.activityMaster
<span style={{ paddingLeft: "6px", whiteSpace: "nowrap" }}>
<u> {
assignData?.workItem?.activityMaster
?.unitOfMeasurement ?.unitOfMeasurement
}</u> }
}</u>
</span> </span>
<div <div
style={{ style={{
@ -702,6 +484,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
className="position-absolute bg-white border p-2 rounded shadow" className="position-absolute bg-white border p-2 rounded shadow"
style={{ zIndex: 10, marginLeft: "10px" }} style={{ zIndex: 10, marginLeft: "10px" }}
> >
{/* Add your help content here */}
<p className="mb-0"> <p className="mb-0">
Enter the target value for today's task. Enter the target value for today's task.
</p> </p>
@ -711,8 +494,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
<label <label
className="form-text fs-7 m-1 text-lg text-dark" className="form-text fs-7 m-1 text-lg text-dark"
htmlFor="descriptionTextarea" htmlFor="descriptionTextarea" // Changed htmlFor for better accessibility
htmlFor="descriptionTextarea"
> >
Description Description
</label> </label>
@ -723,8 +505,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
<textarea <textarea
{...field} {...field}
className="form-control" className="form-control"
id="descriptionTextarea" id="descriptionTextarea" // Changed id for better accessibility
id="descriptionTextarea"
rows="2" rows="2"
/> />
)} )}
@ -734,6 +515,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
)} )}
</div> </div>
{/* Submit and Cancel buttons */}
<div className="col-12 d-flex justify-content-center align-items-center gap-sm-6 gap-8 text-center mt-1"> <div className="col-12 d-flex justify-content-center align-items-center gap-sm-6 gap-8 text-center mt-1">
<button <button
type="submit" type="submit"
@ -759,4 +541,5 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
</div> </div>
); );
}; };
export default AssignTask;
export default AssignTask;