Modified popup of Assign Task.

This commit is contained in:
kartik.sharma 2025-05-15 19:40:09 +05:30 committed by Gitea Admin
parent b2cdd7c02e
commit 5535ff21fa

View File

@ -16,7 +16,6 @@ const AssignRoleModel = ({ assignData, onClose }) => {
const maxPlanned = const maxPlanned =
assignData?.workItem?.workItem?.plannedWork - assignData?.workItem?.workItem?.plannedWork -
assignData?.workItem?.workItem?.completedWork; assignData?.workItem?.workItem?.completedWork;
const schema = z.object({ const schema = z.object({
selectedEmployees: z selectedEmployees: z
.array(z.string()) .array(z.string())
@ -40,7 +39,10 @@ const AssignRoleModel = ({ assignData, onClose }) => {
const selectedProject = useSelector( const selectedProject = useSelector(
(store) => store.localVariables.projectId (store) => store.localVariables.projectId
); );
const { employees,loading:employeeLoading } = useEmployeesAllOrByProjectId(selectedProject,false); const { employees, loading: employeeLoading } = useEmployeesAllOrByProjectId(
selectedProject,
false
);
const dispatch = useDispatch(); const dispatch = useDispatch();
const { data, loading } = useMaster(); const { data, loading } = useMaster();
@ -48,6 +50,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
const [selectedRole, setSelectedRole] = useState("all"); const [selectedRole, setSelectedRole] = useState("all");
const [selectedEmployees, setSelectedEmployees] = useState([]); const [selectedEmployees, setSelectedEmployees] = useState([]);
const [displayedSelection, setDisplayedSelection] = useState("");
const { const {
handleSubmit, handleSubmit,
@ -65,53 +68,67 @@ const AssignRoleModel = ({ assignData, onClose }) => {
resolver: zodResolver(schema), resolver: zodResolver(schema),
}); });
const handleCheckboxChange = (event, user) => {
const isChecked = event.target.checked;
let updatedSelectedEmployees = watch("selectedEmployees") || [];
if (isChecked) {
if (!updatedSelectedEmployees.includes(user.id)) {
updatedSelectedEmployees = [...updatedSelectedEmployees, user.id];
}
} else {
updatedSelectedEmployees = updatedSelectedEmployees.filter(
(id) => id !== user.id
);
}
setValue("selectedEmployees", updatedSelectedEmployees);
};
useEffect(() => {
dispatch(changeMaster("Job Role"));
return () => setSelectedRole("all");
}, [dispatch]);
const handleRoleChange = (event) => { const handleRoleChange = (event) => {
reset();
// setSelectedEmployees([]);
setSelectedRole(event.target.value); setSelectedRole(event.target.value);
}; };
const filteredEmployees = const filteredEmployees =
selectedRole === "all" selectedRole === "all"
? employees ? employees
: employees.filter((emp) => String(emp.jobRoleId || "") === selectedRole); : employees?.filter(
(emp) => String(emp.jobRoleId || "") === selectedRole
const handleEmployeeSelection = (employeeId, field) => { );
setSelectedEmployees((prevSelected) => {
let updatedSelection;
if (!prevSelected.includes(employeeId)) {
updatedSelection = [...prevSelected, employeeId];
} else {
updatedSelection = prevSelected.filter((id) => id !== employeeId);
}
field.onChange(updatedSelection);
return updatedSelection;
});
};
const removeEmployee = (employeeId) => {
setSelectedEmployees((prevSelected) => {
const updatedSelection = prevSelected.filter((id) => id !== employeeId);
setValue("selectedEmployees", updatedSelection); // Ensure form state is updated
return updatedSelection;
});
};
const onSubmit = async (data) => { const onSubmit = async (data) => {
const selectedEmployeeIds = data.selectedEmployees;
const taskTeamWithDetails = selectedEmployeeIds
.map((empId) => {
const employee = employees.find((e) => e.id === empId);
const jobRole = jobRoleData?.find((r) => r.id === employee?.jobRoleId);
return employee
? employee.id
: null;
})
.filter(Boolean);
const formattedData = { const formattedData = {
taskTeam: data.selectedEmployees, taskTeam: taskTeamWithDetails,
plannedTask: data.plannedTask, plannedTask: data.plannedTask,
description: data.description, description: data.description,
assignmentDate: new Date().toISOString(), assignmentDate: new Date().toISOString(),
workItemId: assignData?.workItem?.workItem.id, workItemId: assignData?.workItem?.workItem.id,
}; };
try { try {
let response = await TasksRepository.assignTask(formattedData); let response = await TasksRepository.assignTask(formattedData);
showToast("Task Successfully Assigend", "success"); showToast("Task Successfully Assigned", "success");
setSelectedEmployees([]);
reset(); reset();
onClose(); onClose();
} catch (error) { } catch (error) {
console.log(error.response);
showToast("something wrong", "error"); showToast("something wrong", "error");
} }
}; };
@ -124,6 +141,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
reset(); reset();
onClose(); onClose();
}; };
return ( return (
<div <div
className="modal-dialog modal-lg modal-simple mx-sm-auto mx-1 edit-project-modal" className="modal-dialog modal-lg modal-simple mx-sm-auto mx-1 edit-project-modal"
@ -137,260 +155,295 @@ const AssignRoleModel = ({ assignData, onClose }) => {
onClick={onClose} onClick={onClose}
aria-label="Close" aria-label="Close"
></button> ></button>
<div className="container my-1"> <div className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">
<div className="mb-"> <strong>Assign Task</strong>
<p className="fs-sm-5 fs-6 text-dark text-start d-flex align-items-center flex-wrap"> <div className="container my-4">
{[ <div className="mb-1">
assignData?.building?.name, <p className="mb-0">
assignData?.floor?.floorName, <span className="fs-sm-5 fs-6 text-dark text-start d-flex align-items-center flex-wrap">
assignData?.workArea?.areaName, <strong className="me-2">Work Location:</strong>
assignData?.workItem?.workItem?.activityMaster?.activityName, {[
] assignData?.building?.name,
.filter(Boolean) assignData?.floor?.floorName,
.map((item, index, array) => ( assignData?.workArea?.areaName,
<span key={index} className="d-flex align-items-center"> assignData?.workItem?.workItem?.activityMaster
{item} ?.activityName,
{index < array.length - 1 && ( ]
<i className="bx bx-chevron-right mx-2"></i> .filter(Boolean)
)} .map((item, index, array) => (
</span> <span key={index} className="d-flex align-items-center">
))} {item}
</p> {index < array.length - 1 && (
<i className="bx bx-chevron-right mx-2"></i>
)}
</span>
))}
</span>
</p>
<form onSubmit={handleSubmit(onSubmit)}> <form onSubmit={handleSubmit(onSubmit)}>
<div className="row mb-1"> <div className="form-label text-start">
<div className="col-sm-4"> <div className="row mb-1">
<div className="form-text text-start">Select Role</div> <div className="col-12">
<div className="input-group input-group-merge"> <div className="form-text text-start">
<select
className="form-select form-select-sm"
id="Role"
value={selectedRole}
onChange={handleRoleChange}
aria-label=""
>
{loading && data ? (
"Loading..."
) : (
<>
<option value="all">All</option>
{jobRoleData?.map((item) => (
<option key={item.id} value={item.id}>
{item.name}
</option>
))}
</>
)}
</select>
</div>
</div>
</div>
<div className="divider text-start">
<div className="divider-text">Employee</div>
</div>
{employeeLoading && <div>Loading...</div>}
{!employeeLoading && filteredEmployees?.length === 0 && employees && (
<div>No employees found</div>
)}
<div className="row"> <div className="d-flex align-items-center">
<div className="col-12 col-md-8 h-sm-25 overflow-auto"> <strong>Select Team</strong>
{selectedRole !== "" && ( <div className="me-2">{displayedSelection}</div>
<div className="row mb-2"> <a
<div className="col-sm-12"> className="dropdown-toggle hide-arrow cursor-pointer"
<div className="row"> data-bs-toggle="dropdown"
{filteredEmployees?.map((emp) => { aria-expanded="false"
const jobRole = jobRoleData?.find( >
(role) => role?.id === emp?.jobRoleId <i className="bx bx-filter bx-lg"></i>
); </a>
return ( <ul className="dropdown-menu p-2 text-capitalize">
<div <li key="all">
key={emp.id} <button
className="col-6 col-sm-6 col-md-4 col-lg-4 mb-1" type="button"
className="dropdown-item py-1" // Added py-1 for vertical padding
onClick={() =>
handleRoleChange({
target: { value: "all" },
})
}
> >
<div className="form-check text-start p-0"> All Roles
<div className="li-wrapper d-flex justify-content-start align-items-start"> </button>
</li>
{jobRoleData?.map((user) => (
<li key={user.id}>
<button
type="button"
className="dropdown-item py-1" // Added py-1 for vertical padding
value={user.id}
onClick={handleRoleChange}
>
{user.name}
</button>
</li>
))}
</ul>
</div>
</div>
</div>
</div>
{employeeLoading && <div>Loading...</div>}
{!employeeLoading &&
filteredEmployees?.length === 0 &&
employees && <div>No employees found</div>}
<div className="row">
<div className="col-12 h-sm-25 overflow-auto mt-2">
{selectedRole !== "" && (
<div className="row">
{loading ? (
<div className="col-12">
<p className="text-center">Loading...</p>
</div>
) : filteredEmployees?.length > 0 ? (
filteredEmployees?.map((emp) => {
const jobRole = jobRoleData?.find(
(role) => role?.id === emp?.jobRoleId
);
return (
<div key={emp.id} className="col-6 col-md-4 col-lg-3 mb-3">
<div className="form-check d-flex align-items-start">
<Controller <Controller
name="selectedEmployees" name="selectedEmployees"
control={control} control={control}
render={({ field }) => ( render={({ field }) => (
<input <input
{...field} {...field}
className="form-check-input mx-2" className="form-check-input me-1 mt-1"
type="checkbox" type="checkbox"
id={`employee-${emp?.id}`} id={`employee-${emp?.id}`}
value={emp.id} value={emp.id}
checked={field.value.includes( checked={field.value.includes(emp.id)}
emp.id onChange={(e) => {
)} handleCheckboxChange(e, emp);
onChange={() => {
handleEmployeeSelection(
emp.id,
field
);
}} }}
/> />
)} )}
/> />
<div className="list-content"> <div className="flex-grow-1">
<p <p className="mb-1 fw-bold" style={{ fontSize: "13px" }}>
className=" mb-0"
style={{
fontSize: "12px",
fontWeight: "bolder",
}}
>
{emp.firstName} {emp.lastName} {emp.firstName} {emp.lastName}
</p> </p>
<small <small className="text-muted" style={{ fontSize: "11px" }}>
className="lead" {loading ? (
style={{ fontSize: "10px" }} <span className="placeholder-glow">
> <span className="placeholder col-6"></span>
{loading && ( </span>
<p ) : (
className="skeleton para" jobRole?.name || "Unknown Role"
style={{ height: "7px" }}
></p>
)} )}
{data &&
!loading &&
(jobRole
? jobRole.name
: "Unknown Role")}
</small> </small>
</div> </div>
</div> </div>
</div> </div>
</div> );
})
) : (
<div className="col-12">
<p className="text-center">No employees found for the selected role.</p>
</div>
)}
</div>
)}
</div>
</div>
<div
className="col-12 h-25 overflow-auto"
style={{ maxHeight: "200px" }}
>
{watch("selectedEmployees")?.length > 0 && (
<div className="mt-1">
<div className="text-start px-2">
{watch("selectedEmployees")?.map((empId) => {
const emp = employees.find(
(emp) => emp.id === empId
);
return (
emp && (
<span
key={empId}
className="badge rounded-pill bg-label-primary d-inline-flex align-items-center me-1 mb-1"
>
{emp.firstName} {emp.lastName}
<p
type="button"
className=" btn-close-white p-0 m-0"
aria-label="Close"
onClick={() => {
const employeeToRemove = employees.find(
(e) => e.id === empId
);
const updatedSelected = watch(
"selectedEmployees"
).filter((id) => id !== empId);
setValue(
"selectedEmployees",
updatedSelected
);
}}
>
<i className="icon-base bx bx-x icon-md "></i>
</p>
</span>
)
); );
})} })}
</div> </div>
</div> </div>
</div> )}
)} </div>
</div>
<div
className="col-12 col-md-4 h-25 overflow-auto"
style={{ maxHeight: "200px" }}
>
{selectedEmployees.length > 0 && (
<div className="mt-1">
<div className="text-start px-2">
{selectedEmployees.map((empId) => {
const emp = employees.find(
(emp) => emp.id === empId
);
return (
<span
key={empId}
className="badge bg-label-primary d-inline-flex align-items-center gap-2 me-1 p-1 mb-2"
>
{emp.firstName} {emp.lastName}
<p
type="button"
className=" btn-close-white p-0 m-0"
aria-label="Close"
onClick={() => {
removeEmployee(empId);
setValue(
"selectedEmployees",
selectedEmployees.filter(
(id) => id !== empId
)
);
}}
>
<i className="icon-base bx bx-x icon-md "></i>
</p>
</span>
);
})}
</div>
</div>
)}
</div>
</div>
<div className="col-md text-start mx-0 px-0"> <div className="col-md text-start mx-0 px-0">
<div className="form-check form-check-inline mt-4 px-1"> <div className="form-check form-check-inline mt-3 px-1">
<label className="form-text fs-6" for="inlineCheckbox1"> <label
Pending Work className="form-text fs-6"
</label> htmlFor="inlineCheckbox1"
<label >
className="form-check-label ms-2" <strong>Pending Task of Activity:</strong>
for="inlineCheckbox1" </label>
> <label
{assignData?.workItem?.workItem?.plannedWork - className="form-check-label ms-4"
assignData?.workItem?.workItem?.completedWork} htmlFor="inlineCheckbox1"
</label> >
</div>
<div className="form-check form-check-inline col-sm-2 col"> {assignData?.workItem?.workItem?.plannedWork -
<label for="defaultFormControlInput" className="form-label"> assignData?.workItem?.workItem?.completedWork}{" "}
Target {
assignData?.workItem?.workItem?.activityMaster
?.unitOfMeasurement
}
</label>
</div>
</div>
<div className="col-md text-start mx-0 px-0">
<div className="form-check form-check-inline mt-2 px-1">
<label
className="form-text fs-6"
htmlFor="inlineCheckbox1"
>
<strong>Target for Today:</strong>
</label>
</div>
<div className="form-check form-check-inline col-sm-2 col">
<Controller
name="plannedTask"
control={control}
render={({ field }) => (
<input
type="text"
className="form-control form-control-xs"
{...field}
id="defaultFormControlInput"
aria-describedby="defaultFormControlHelp"
/>
)}
/>
</div>
{errors.plannedTask && (
<div className="danger-text mt-1">
{errors.plannedTask.message}
</div>
)}
</div>
{errors.selectedEmployees && (
<div className="danger-text mt-1">
<p>{errors.selectedEmployees.message}</p>
</div>
)}
<label htmlFor="exampleFormControlTextarea1">
<strong>Description</strong>
</label> </label>
<Controller <Controller
name="plannedTask" name="description"
control={control} control={control}
render={({ field }) => ( render={({ field }) => (
<input <textarea
type="text"
className="form-control form-control-xs"
{...field} {...field}
id="defaultFormControlInput" className="form-control"
aria-describedby="defaultFormControlHelp" id="exampleFormControlTextarea1"
rows="2"
/> />
)} )}
/> />
{errors.description && (
<div className="danger-text">
{errors.description.message}
</div>
)}
</div> </div>
{errors.plannedTask && (
<div className="danger-text mt-1">
{errors.plannedTask.message}
</div>
)}
</div>
{errors.selectedEmployees && (
<div className="danger-text mt-1">
<p>{errors.selectedEmployees.message}</p>
</div>
)}
<label for="exampleFormControlTextarea1" className="form-label"> <div className="col-12 d-flex justify-content-center align-items-center gap-sm-6 gap-8 text-center mt-1">
Description <button type="submit" className="btn btn-sm btn-primary ">
</label> Submit
<Controller </button>
name="description" <button
control={control} type="reset"
render={({ field }) => ( className="btn btn-sm btn-label-secondary"
<textarea data-bs-dismiss="modal"
{...field} aria-label="Close"
className="form-control" onClick={closedModel}
id="exampleFormControlTextarea1" >
rows="2" Cancel
/> </button>
)}
/>
{errors.description && (
<div className="danger-text">
{errors.description.message}
</div> </div>
)} </form>
</div>
<div className="col-12 d-flex justify-content-center align-items-center gap-sm-6 gap-8 text-center mt-1">
<button type="submit" className="btn btn-sm btn-primary ">
Submit
</button>
<button
type="reset"
className="btn btn-sm btn-label-secondary"
data-bs-dismiss="modal"
aria-label="Close"
onClick={closedModel}
>
Cancel
</button>
</div>
</form>
</div> </div>
</div> </div>
</div> </div>