src/components/Project/AssignTask.jsx

@@ -15,8 +15,7 @@ import { useCreateTask } from "../../hooks/useTasks";
 
 const AssignTask = ({ assignData, onClose, setAssigned }) => {
   const maxPlanned =
-    assignData?.workItem?.plannedWork -
-    assignData?.workItem?.completedWork;
+    assignData?.workItem?.plannedWork - assignData?.workItem?.completedWork;
   const schema = z.object({
     selectedEmployees: z
       .array(z.string())
@@ -79,7 +78,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
     employees,
     loading: employeeLoading,
     recallEmployeeData,
-  } = useEmployeesAllOrByProjectId(selectedProject, false);
+  } = useEmployeesAllOrByProjectId(false, selectedProject, false);
   const dispatch = useDispatch();
   const { loading } = useMaster();
   const { data: jobRoleData } = useMaster();
@@ -137,11 +136,12 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
           (emp) => String(emp.jobRoleId || "") === selectedRole
         );
 
-
   const onSubmit = (data) => {
     const selectedEmployeeIds = data.selectedEmployees;
 
-    const taskTeamWithDetails = selectedEmployeeIds?.map((empId) => empId)?.filter(Boolean);
+    const taskTeamWithDetails = selectedEmployeeIds
+      ?.map((empId) => empId)
+      ?.filter(Boolean);
     const formattedData = {
       taskTeam: taskTeamWithDetails,
       plannedTask: data.plannedTask,
@@ -149,7 +149,10 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
       assignmentDate: new Date().toISOString(),
       workItemId: assignData?.workItem.id,
     };
-    assignTask({payload:formattedData,workAreaId:assignData?.workArea?.id});
+    assignTask({
+      payload: formattedData,
+      workAreaId: assignData?.workArea?.id,
+    });
   };
 
   const closedModel = () => {
@@ -234,12 +237,12 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
                 <div className="col-12 h-sm-25 overflow-auto mt-2">
                   {selectedRole !== "" && (
                     <div className="row">
-                      {loading ? ( // Assuming 'loading' here refers to master data loading
-                        <div className="col-12">
-                          <p className="text-center">Loading roles...</p>
+                      {employeeLoading ? (
+                        <div className="col-12 text-center py-3">
+                          <p className="mt-2">Loading employees...</p>
                         </div>
                       ) : filteredEmployees?.length > 0 ? (
-                        filteredEmployees?.map((emp) => {
+                        filteredEmployees.map((emp) => {
                           const jobRole = jobRoleData?.find(
                             (role) => role?.id === emp?.jobRoleId
                           );
@@ -278,13 +281,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
                                     className="text-muted"
                                     style={{ fontSize: "11px" }}
                                   >
-                                    {loading ? (
-                                      <span className="placeholder-glow">
-                                        <span className="placeholder col-6"></span>
-                                      </span>
-                                    ) : (
-                                      jobRole?.name || "Unknown Role"
-                                    )}
+                                    {jobRole?.name || "Unknown Role"}
                                   </small>
                                 </div>
                               </div>
@@ -348,7 +345,6 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
               {!loading && errors.selectedEmployees && (
                 <div className="danger-text mt-1">
                   <p>{errors.selectedEmployees.message}</p>{" "}
-                
                 </div>
               )}
 

src/components/Project/Infrastructure/WorkArea.jsx

@@ -125,7 +125,7 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
                   {isLoading  || ProjectTaskList === undefined  ? (
                     <div className="text-center py-2 text-muted">Loading activities...</div>
                   ) :  ProjectTaskList?.length ===  0 ? (
-                    <div className="text-center py-2 text-muted">Loading activities...</div>
+                    <div className="text-center py-2 text-muted"> No activities available for this work area !</div>
                   ):ProjectTaskList?.length > 0 ? (
                     <table className="table table-sm mx-1">
                       <thead>
@@ -165,7 +165,7 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
                     </table>
                   ) : (
                     <div className="text-center text-muted py-3">
-                      No activities available for this work area.
+                      No activities available for this work area !
                     </div>
                   )}
                 </div>