admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Correction in Assign Task popup.

Browse Source
This commit is contained in:
kartik.sharma 2025-05-24 14:45:29 +05:30
parent aa50aeff98
commit a6c6a73899
1 changed files with 103 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
src/components/Project/AssignRole.jsx
View File

@ -2,56 +2,61 @@ import React, { useState, useEffect, useRef } from "react";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { changeMaster } from "../../slices/localVariablesSlice"; import { changeMaster } from "../../slices/localVariablesSlice";
import useMaster from "../../hooks/masterHook/useMaster"; import useMaster from "../../hooks/masterHook/useMaster";
import { employee } from "../../data/masters";
import { useForm, Controller } from "react-hook-form"; import { useForm, Controller } from "react-hook-form";
import { z } from "zod"; import { z } from "zod";
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { getCachedData } from "../../slices/apiDataManager"; import { getCachedData } from "../../slices/apiDataManager";
import { useProjects } from "../../hooks/useProjects";
import { useEmployeesAllOrByProjectId } from "../../hooks/useEmployees"; import { useEmployeesAllOrByProjectId } from "../../hooks/useEmployees";
import { TasksRepository } from "../../repositories/ProjectRepository"; import { TasksRepository } from "../../repositories/ProjectRepository";
import showToast from "../../services/toastService"; import showToast from "../../services/toastService";
const AssignRoleModel = ({ assignData, onClose }) => { const AssignRoleModel = ({ assignData, onClose }) => {
// Calculate maxPlanned based on assignData
const maxPlanned = const maxPlanned =
assignData?.workItem?.workItem?.plannedWork - assignData?.workItem?.workItem?.plannedWork -
assignData?.workItem?.workItem?.completedWork; assignData?.workItem?.workItem?.completedWork;
// Zod schema for form validation
const schema = z.object({ const schema = z.object({
selectedEmployees: z selectedEmployees: z
.array(z.string()) .array(z.string())
.min(1, { message: "At least one employee must be selected" }), .min(1, { message: "At least one employee must be selected" }), // Added custom message here for consistency
description: z.string().min(1, { message: "Description is required" }), description: z.string().min(1, { message: "Description is required" }),
plannedTask: z.preprocess( plannedTask: z.preprocess(
(val) => parseInt(val, 10), (val) => parseInt(val, 10), // Preprocess value to integer
z z
.number({ .number({
required_error: "Planned task is required", required_error: "Planned task is required",
invalid_type_error: "Planned task must be a number", invalid_type_error: "Target for Today must be a number",
}) })
.int() .int() // Ensure it's an integer
.positive({ message: "Planned task must be a positive number" }) .positive({ message: "Planned task must be a positive number" }) // Must be positive
.max(maxPlanned, { .max(maxPlanned, {
// Max value validation
message: `Planned task cannot exceed ${maxPlanned}`, message: `Planned task cannot exceed ${maxPlanned}`,
}) })
), ),
}); });
// State for help popovers (though not fully implemented in provided snippets)
const [isHelpVisibleTarget, setIsHelpVisibleTarget] = useState(false); const [isHelpVisibleTarget, setIsHelpVisibleTarget] = useState(false);
const helpPopupRefTarget = useRef(null); const helpPopupRefTarget = useRef(null);
const [isHelpVisible, setIsHelpVisible] = useState(false); const [isHelpVisible, setIsHelpVisible] = useState(false);
// Refs for Bootstrap Popovers
const infoRef = useRef(null); const infoRef = useRef(null);
const infoRef1 = useRef(null); const infoRef1 = useRef(null);
// Initialize Bootstrap Popovers on component mount
useEffect(() => { useEffect(() => {
// Check if Bootstrap is available globally
if (typeof bootstrap !== 'undefined') {
if (infoRef.current) { if (infoRef.current) {
new bootstrap.Popover(infoRef.current, { new bootstrap.Popover(infoRef.current, {
trigger: 'focus', trigger: 'focus',
placement: 'right', placement: 'right',
html: true, html: true,
content: `<div>Pending Task assign for today</div>`, content: `<div>Total Pending tasks of the Activity</div>`,
}); });
} }
@ -63,10 +68,12 @@ const AssignRoleModel = ({ assignData, onClose }) => {
content: `<div>Target task for today</div>`, content: `<div>Target task for today</div>`,
}); });
} }
}, []); } else {
console.warn("Bootstrap is not available. Popovers might not function.");
}
}, []); // Empty dependency array ensures this runs once on mount
// Redux state and hooks
const [plannedTask, setPlannedTask] = useState();
const selectedProject = useSelector( const selectedProject = useSelector(
(store) => store.localVariables.projectId (store) => store.localVariables.projectId
); );
@ -74,15 +81,15 @@ const AssignRoleModel = ({ assignData, onClose }) => {
selectedProject, selectedProject,
false false
); );
const dispatch = useDispatch(); const dispatch = useDispatch();
const { data, loading } = useMaster(); const { loading } = useMaster(); // Assuming this is for jobRoleData loading
const jobRoleData = getCachedData("Job Role"); const jobRoleData = getCachedData("Job Role");
// Local component states
const [selectedRole, setSelectedRole] = useState("all"); const [selectedRole, setSelectedRole] = useState("all");
const [selectedEmployees, setSelectedEmployees] = useState([]); const [displayedSelection, setDisplayedSelection] = useState(""); // This state is not updated in the provided code, consider if it's still needed or how it should be updated
const [displayedSelection, setDisplayedSelection] = useState("");
// React Hook Form setup
const { const {
handleSubmit, handleSubmit,
control, control,
@ -90,41 +97,50 @@ const AssignRoleModel = ({ assignData, onClose }) => {
watch, watch,
formState: { errors }, formState: { errors },
reset, reset,
trigger, // <--- IMPORTANT: Destructure 'trigger' here
} = useForm({ } = useForm({
defaultValues: { defaultValues: {
selectedEmployees: [], selectedEmployees: [],
description: "", description: "",
plannedTask: "", plannedTask: "",
}, },
resolver: zodResolver(schema), resolver: zodResolver(schema), // Integrate Zod schema with react-hook-form
}); });
// Handler for employee checkbox changes
const handleCheckboxChange = (event, user) => { const handleCheckboxChange = (event, user) => {
const isChecked = event.target.checked; const isChecked = event.target.checked;
let updatedSelectedEmployees = watch("selectedEmployees") || []; let updatedSelectedEmployees = watch("selectedEmployees") || []; // Get current selected employees from form state
if (isChecked) { if (isChecked) {
// Add employee if checked and not already in the list
if (!updatedSelectedEmployees.includes(user.id)) { if (!updatedSelectedEmployees.includes(user.id)) {
updatedSelectedEmployees = [...updatedSelectedEmployees, user.id]; updatedSelectedEmployees = [...updatedSelectedEmployees, user.id];
} }
} else { } else {
// Remove employee if unchecked
updatedSelectedEmployees = updatedSelectedEmployees.filter( updatedSelectedEmployees = updatedSelectedEmployees.filter(
(id) => id !== user.id (id) => id !== user.id
); );
} }
// Update the form state with the new list of selected employees
setValue("selectedEmployees", updatedSelectedEmployees); setValue("selectedEmployees", updatedSelectedEmployees);
trigger("selectedEmployees"); // <--- IMPORTANT: Trigger validation here
}; };
// Effect to dispatch action for Job Role master data
useEffect(() => { useEffect(() => {
dispatch(changeMaster("Job Role")); dispatch(changeMaster("Job Role"));
// Cleanup function to reset selected role when component unmounts or dispatch changes
return () => setSelectedRole("all"); return () => setSelectedRole("all");
}, [dispatch]); }, [dispatch]);
// Handler for role filter change
const handleRoleChange = (event) => { const handleRoleChange = (event) => {
setSelectedRole(event.target.value); setSelectedRole(event.target.value);
}; };
// Filter employees based on selected role
const filteredEmployees = const filteredEmployees =
selectedRole === "all" selectedRole === "all"
? employees ? employees
@ -132,42 +148,39 @@ const AssignRoleModel = ({ assignData, onClose }) => {
(emp) => String(emp.jobRoleId || "") === selectedRole (emp) => String(emp.jobRoleId || "") === selectedRole
); );
// Form submission handler
const onSubmit = async (data) => { const onSubmit = async (data) => {
const selectedEmployeeIds = data.selectedEmployees; const selectedEmployeeIds = data.selectedEmployees;
// Prepare taskTeam data (only IDs are needed for the backend based on previous context)
const taskTeamWithDetails = selectedEmployeeIds const taskTeamWithDetails = selectedEmployeeIds
.map((empId) => { .map((empId) => {
const employee = employees.find((e) => e.id === empId); return empId; // Return just the ID as per previous discussions
const jobRole = jobRoleData?.find((r) => r.id === employee?.jobRoleId);
return employee
? employee.id
: null;
}) })
.filter(Boolean); .filter(Boolean); // Ensure no nulls if employee not found (though unlikely with current logic)
// Format data for API call
const formattedData = { const formattedData = {
taskTeam: taskTeamWithDetails, taskTeam: taskTeamWithDetails,
plannedTask: data.plannedTask, plannedTask: data.plannedTask,
description: data.description, description: data.description,
assignmentDate: new Date().toISOString(), assignmentDate: new Date().toISOString(), // Current date/time
workItemId: assignData?.workItem?.workItem.id, workItemId: assignData?.workItem?.workItem.id,
}; };
try { try {
let response = await TasksRepository.assignTask(formattedData); // Call API to assign task
showToast("Task Successfully Assigned", "success"); await TasksRepository.assignTask(formattedData);
reset(); showToast("Task Successfully Assigned", "success"); // Show success toast
onClose(); reset(); // Reset form fields
onClose(); // Close the modal
} catch (error) { } catch (error) {
console.log(error.response); console.error("Error assigning task:", error); // Log the full error for debugging
showToast("something wrong", "error"); showToast("Something went wrong. Please try again.", "error"); // Show generic error toast
} }
}; };
useEffect(() => {
dispatch(changeMaster("Job Role"));
return () => setSelectedRole("all");
}, [dispatch]);
// Handler to close the modal and reset form
const closedModel = () => { const closedModel = () => {
reset(); reset();
onClose(); onClose();
@ -200,7 +213,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
assignData?.workItem?.workItem?.activityMaster assignData?.workItem?.workItem?.activityMaster
?.activityName, ?.activityName,
] ]
.filter(Boolean) .filter(Boolean) // Filter out any undefined/null values
.map((item, index, array) => ( .map((item, index, array) => (
<span key={index} className="d-flex align-items-center"> <span key={index} className="d-flex align-items-center">
{item} {item}
@ -232,7 +245,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
<li key="all"> <li key="all">
<button <button
type="button" type="button"
className="dropdown-item py-1" // Added py-1 for vertical padding className="dropdown-item py-1"
onClick={() => onClick={() =>
handleRoleChange({ handleRoleChange({
target: { value: "all" }, target: { value: "all" },
@ -246,7 +259,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
<li key={user.id}> <li key={user.id}>
<button <button
type="button" type="button"
className="dropdown-item py-1" // Added py-1 for vertical padding className="dropdown-item py-1"
value={user.id} value={user.id}
onClick={handleRoleChange} onClick={handleRoleChange}
> >
@ -256,24 +269,24 @@ const AssignRoleModel = ({ assignData, onClose }) => {
))} ))}
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{employeeLoading && <div>Loading...</div>} {employeeLoading && <div>Loading employees...</div>}
{!employeeLoading && {!employeeLoading &&
filteredEmployees?.length === 0 && filteredEmployees?.length === 0 &&
employees && <div>No employees found</div>} employees && (
<div>No employees found for the selected role.</div>
)}
<div className="row"> <div className="row">
<div className="col-12 h-sm-25 overflow-auto mt-2"> <div className="col-12 h-sm-25 overflow-auto mt-2">
{selectedRole !== "" && ( {selectedRole !== "" && (
<div className="row"> <div className="row">
{loading ? ( {loading ? ( // Assuming 'loading' here refers to master data loading
<div className="col-12"> <div className="col-12">
<p className="text-center">Loading...</p> <p className="text-center">Loading roles...</p>
</div> </div>
) : filteredEmployees?.length > 0 ? ( ) : filteredEmployees?.length > 0 ? (
filteredEmployees?.map((emp) => { filteredEmployees?.map((emp) => {
@ -282,7 +295,10 @@ const AssignRoleModel = ({ assignData, onClose }) => {
); );
return ( return (
<div key={emp.id} className="col-6 col-md-4 col-lg-3 mb-3"> <div
key={emp.id}
className="col-6 col-md-4 col-lg-3 mb-3"
>
<div className="form-check d-flex align-items-start"> <div className="form-check d-flex align-items-start">
<Controller <Controller
name="selectedEmployees" name="selectedEmployees"
@ -294,7 +310,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
type="checkbox" type="checkbox"
id={`employee-${emp?.id}`} id={`employee-${emp?.id}`}
value={emp.id} value={emp.id}
checked={field.value.includes(emp.id)} checked={field.value?.includes(emp.id)}
onChange={(e) => { onChange={(e) => {
handleCheckboxChange(e, emp); handleCheckboxChange(e, emp);
}} }}
@ -305,7 +321,10 @@ const AssignRoleModel = ({ assignData, onClose }) => {
<p className="mb-0" style={{ fontSize: "13px" }}> <p className="mb-0" style={{ fontSize: "13px" }}>
{emp.firstName} {emp.lastName} {emp.firstName} {emp.lastName}
</p> </p>
<small className="text-muted" style={{ fontSize: "11px" }}> <small
className="text-muted"
style={{ fontSize: "11px" }}
>
{loading ? ( {loading ? (
<span className="placeholder-glow"> <span className="placeholder-glow">
<span className="placeholder col-6"></span> <span className="placeholder col-6"></span>
@ -328,6 +347,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
)} )}
</div> </div>
</div> </div>
<div <div
className="col-12 h-25 overflow-auto" className="col-12 h-25 overflow-auto"
style={{ maxHeight: "200px" }} style={{ maxHeight: "200px" }}
@ -351,9 +371,6 @@ const AssignRoleModel = ({ assignData, onClose }) => {
className=" btn-close-white p-0 m-0" className=" btn-close-white p-0 m-0"
aria-label="Close" aria-label="Close"
onClick={() => { onClick={() => {
const employeeToRemove = employees.find(
(e) => e.id === empId
);
const updatedSelected = watch( const updatedSelected = watch(
"selectedEmployees" "selectedEmployees"
).filter((id) => id !== empId); ).filter((id) => id !== empId);
@ -361,6 +378,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
"selectedEmployees", "selectedEmployees",
updatedSelected updatedSelected
); );
trigger("selectedEmployees"); // <--- IMPORTANT: Trigger validation on removing badge
}} }}
> >
<i className="icon-base bx bx-x icon-md "></i> <i className="icon-base bx bx-x icon-md "></i>
@ -374,6 +392,13 @@ const AssignRoleModel = ({ assignData, onClose }) => {
)} )}
</div> </div>
{!loading && errors.selectedEmployees && (
<div className="danger-text mt-1">
<p>{errors.selectedEmployees.message}</p> {/* Use message from Zod schema */}
</div>
)}
{/* Pending Task of Activity section */}
<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-3 px-1"> <div className="form-check form-check-inline mt-3 px-1">
<label className="form-text text-dark align-items-center d-flex" htmlFor="inlineCheckbox1"> <label className="form-text text-dark align-items-center d-flex" htmlFor="inlineCheckbox1">
@ -414,7 +439,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
</div> </div>
</div> </div>
{/* Target for Today input and validation */}
<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-2 px-1 mb-2 text-start"> <div className="form-check form-check-inline mt-2 px-1 mb-2 text-start">
<label <label
@ -449,7 +474,6 @@ const AssignRoleModel = ({ assignData, onClose }) => {
data-bs-trigger="focus" data-bs-trigger="focus"
data-bs-placement="right" data-bs-placement="right"
data-bs-html="true" data-bs-html="true"
style={{ cursor: "pointer" }} style={{ cursor: "pointer" }}
> >
&nbsp; &nbsp;
@ -469,7 +493,6 @@ const AssignRoleModel = ({ assignData, onClose }) => {
</div> </div>
)} )}
/> />
</div> </div>
{errors.plannedTask && ( {errors.plannedTask && (
@ -486,14 +509,11 @@ const AssignRoleModel = ({ assignData, onClose }) => {
</div> </div>
)} )}
</div> </div>
{errors.selectedEmployees && (
<div className="danger-text mt-1"> {/* Description field */}
<p>{errors.selectedEmployees.message}</p>
</div>
)}
<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="inlineCheckbox1" htmlFor="descriptionTextarea" // Changed htmlFor for better accessibility
> >
Description Description
</label> </label>
@ -504,7 +524,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
<textarea <textarea
{...field} {...field}
className="form-control" className="form-control"
id="exampleFormControlTextarea1" id="descriptionTextarea" // Changed id for better accessibility
rows="2" rows="2"
/> />
)} )}
@ -516,6 +536,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
)} )}
</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 type="submit" className="btn btn-sm btn-primary "> <button type="submit" className="btn btn-sm btn-primary ">
Submit Submit
@ -539,4 +560,5 @@ const AssignRoleModel = ({ assignData, onClose }) => {
</div> </div>
); );
}; };
export default AssignRoleModel; export default AssignRoleModel;