src/components/Activities/Attendance.jsx

@@ -9,7 +9,6 @@ import { useNavigate } from "react-router-dom";
 const Attendance = ({ attendance, getRole, handleModalData }) => {
   const [loading, setLoading] = useState(false);
   const navigate = useNavigate();
-  const [todayDate, setTodayDate] = useState(new Date());
 
   // Ensure attendance is an array
   const attendanceList = Array.isArray(attendance) ? attendance : [];
@@ -42,13 +41,6 @@ const Attendance = ({ attendance, getRole, handleModalData }) => {
           <>
             <table className="table ">
               <thead>
-                <tr className="border-top-0" style={{ textAlign: 'left' }}>
-                  <td >
-                    <strong>Date : {todayDate.toLocaleDateString('en-GB')}</strong>
-                  </td>
-                  <td style={{ paddingLeft: '20px' }}>
-                  </td>
-                </tr>
                 <tr>
                   <th className="border-top-0" colSpan={2}>
                     Name
@@ -134,8 +126,9 @@ const Attendance = ({ attendance, getRole, handleModalData }) => {
               <nav aria-label="Page ">
                 <ul className="pagination pagination-sm justify-content-end py-1">
                   <li
-                    className={`page-item  ${currentPage === 1 ? "disabled" : ""
+                    className={`page-item  ${
-                      }`}
+                      currentPage === 1 ? "disabled" : ""
+                    }`}
                   >
                     <button
                       className="page-link btn-xs"
@@ -147,8 +140,9 @@ const Attendance = ({ attendance, getRole, handleModalData }) => {
                   {[...Array(totalPages)].map((_, index) => (
                     <li
                       key={index}
-                      className={`page-item ${currentPage === index + 1 ? "active" : ""
+                      className={`page-item ${
-                        }`}
+                        currentPage === index + 1 ? "active" : ""
+                      }`}
                     >
                       <button
                         className="page-link "
@@ -159,8 +153,9 @@ const Attendance = ({ attendance, getRole, handleModalData }) => {
                     </li>
                   ))}
                   <li
-                    className={`page-item ${currentPage === totalPages ? "disabled" : ""
+                    className={`page-item ${
-                      }`}
+                      currentPage === totalPages ? "disabled" : ""
+                    }`}
                   >
                     <button
                       className="page-link "

src/components/Project/AssignRole.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from "react";
+import React, { useState, useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { changeMaster } from "../../slices/localVariablesSlice";
 import useMaster from "../../hooks/masterHook/useMaster";
@@ -16,6 +16,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
   const maxPlanned =
     assignData?.workItem?.workItem?.plannedWork -
     assignData?.workItem?.workItem?.completedWork;
+
   const schema = z.object({
     selectedEmployees: z
       .array(z.string())
@@ -35,45 +36,11 @@ const AssignRoleModel = ({ assignData, onClose }) => {
         })
     ),
   });
-
-  const [isHelpVisibleTarget, setIsHelpVisibleTarget] = useState(false);
-  const helpPopupRefTarget = useRef(null);
-
-  const [isHelpVisible, setIsHelpVisible] = useState(false);
-
-  const infoRef = useRef(null);
-  const infoRef1 = useRef(null);
-
-  useEffect(() => {
-  
-   if (infoRef.current) {
-      new bootstrap.Popover(infoRef.current, {
-        trigger: 'focus',
-        placement: 'right',
-        html: true,
-        content: `<div>Pending Task assign for today</div>`,
-      });
-    }
-
-    if (infoRef1.current) {
-      new bootstrap.Popover(infoRef1.current, {
-        trigger: 'focus',
-        placement: 'right',
-        html: true,
-        content: `<div>Target task for today</div>`,
-      });
-    }
-  }, []);
-
-
   const [plannedTask, setPlannedTask] = useState();
   const selectedProject = useSelector(
     (store) => store.localVariables.projectId
   );
-  const { employees, loading: employeeLoading } = useEmployeesAllOrByProjectId(
+  const { employees,loading:employeeLoading } = useEmployeesAllOrByProjectId(selectedProject,false);
-    selectedProject,
-    false
-  );
 
   const dispatch = useDispatch();
   const { data, loading } = useMaster();
@@ -81,7 +48,6 @@ const AssignRoleModel = ({ assignData, onClose }) => {
 
   const [selectedRole, setSelectedRole] = useState("all");
   const [selectedEmployees, setSelectedEmployees] = useState([]);
-  const [displayedSelection, setDisplayedSelection] = useState("");
 
   const {
     handleSubmit,
@@ -99,67 +65,53 @@ const AssignRoleModel = ({ assignData, onClose }) => {
     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) => {
+    reset();
+    // setSelectedEmployees([]);
     setSelectedRole(event.target.value);
   };
 
   const filteredEmployees =
     selectedRole === "all"
       ? employees
-      : employees?.filter(
+      : employees.filter((emp) => String(emp.jobRoleId || "") === selectedRole);
-        (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 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 = {
-      taskTeam: taskTeamWithDetails,
+      taskTeam: data.selectedEmployees,
       plannedTask: data.plannedTask,
       description: data.description,
       assignmentDate: new Date().toISOString(),
       workItemId: assignData?.workItem?.workItem.id,
     };
-
     try {
       let response = await TasksRepository.assignTask(formattedData);
-      showToast("Task Successfully Assigned", "success");
+      showToast("Task Successfully Assigend", "success");
+      setSelectedEmployees([]);
       reset();
       onClose();
     } catch (error) {
-      console.log(error.response);
       showToast("something wrong", "error");
     }
   };
@@ -172,7 +124,6 @@ const AssignRoleModel = ({ assignData, onClose }) => {
     reset();
     onClose();
   };
-
   return (
     <div
       className="modal-dialog modal-lg modal-simple mx-sm-auto mx-1 edit-project-modal"
@@ -186,352 +137,260 @@ const AssignRoleModel = ({ assignData, onClose }) => {
             onClick={onClose}
             aria-label="Close"
           ></button>
-          <div className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">
+          <div className="container my-1">
-            <p className="align-items-center flex-wrap m-0 ">Assign Task</p>
+            <div className="mb-">
-            <div className="container my-3">
+              <p className="fs-sm-5 fs-6 text-dark text-start d-flex align-items-center flex-wrap">
-              <div className="mb-1">
+                {[
-                <p className="mb-0">
+                  assignData?.building?.name,
-                  <span className="text-dark text-start d-flex align-items-center flex-wrap form-text">
+                  assignData?.floor?.floorName,
-                    <p className="me-2 m-0 font-bold">Work Location :</p>
+                  assignData?.workArea?.areaName,
-                    {[
+                  assignData?.workItem?.workItem?.activityMaster?.activityName,
-                      assignData?.building?.name,
+                ]
-                      assignData?.floor?.floorName,
+                  .filter(Boolean)
-                      assignData?.workArea?.areaName,
+                  .map((item, index, array) => (
-                      assignData?.workItem?.workItem?.activityMaster
+                    <span key={index} className="d-flex align-items-center">
-                        ?.activityName,
+                      {item}
-                    ]
+                      {index < array.length - 1 && (
-                      .filter(Boolean)
+                        <i className="bx bx-chevron-right mx-2"></i>
-                      .map((item, index, array) => (
+                      )}
-                        <span key={index} className="d-flex align-items-center">
+                    </span>
-                          {item}
+                  ))}
-                          {index < array.length - 1 && (
+              </p>
-                            <i className="bx bx-chevron-right mx-2"></i>
-                          )}
-                        </span>
-                      ))}
-                  </span>
-                </p>
 
-                <form onSubmit={handleSubmit(onSubmit)}>
+              <form onSubmit={handleSubmit(onSubmit)}>
-                  <div className="form-label text-start">
+                <div className="row mb-1">
-                    <div className="row mb-1">
+                  <div className="col-sm-4">
-                      <div className="col-12">
+                    <div className="form-text text-start">Select Role</div>
-                        <div className="form-text text-start">
+                    <div className="input-group input-group-merge">
-                          <div className="d-flex align-items-center form-text fs-7">
+                      <select
-                            <span className="text-dark">Select Team</span>
+                        className="form-select form-select-sm"
-                            <div className="me-2">{displayedSelection}</div>
+                        id="Role"
-                            <a
+                        value={selectedRole}
-                              className="dropdown-toggle hide-arrow cursor-pointer"
+                        onChange={handleRoleChange}
-                              data-bs-toggle="dropdown"
+                        aria-label=""
-                              aria-expanded="false"
+                      >
-                            >
+                        {loading && data ? (
-                              <i className="bx bx-filter bx-lg text-primary"></i>
+                          "Loading..."
-                            </a>
+                        ) : (
-
+                          <>
-                            <ul className="dropdown-menu p-2 text-capitalize">
+                            <option value="all">All</option>
-                              <li key="all">
+                            {jobRoleData?.map((item) => (
-                                <button
+                              <option key={item.id} value={item.id}>
-                                  type="button"
+                                {item.name}
-                                  className="dropdown-item py-1" // Added py-1 for vertical padding
+                              </option>
-                                  onClick={() =>
+                            ))}
-                                    handleRoleChange({
+                          </>
-                                      target: { value: "all" },
+                        )}
-                                    })
+                      </select>
-                                  }
-                                >
-                                  All Roles
-                                </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>
+                  </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>
+                )}
 
-                    {employeeLoading && <div>Loading...</div>}
+                <div className="row">
-                    {!employeeLoading &&
+                  <div className="col-12 col-md-8 h-sm-25 overflow-auto">
-                      filteredEmployees?.length === 0 &&
+                    {selectedRole !== "" && (
-                      employees && <div>No employees found</div>}
+                      <div className="row mb-2">
-
+                        <div className="col-sm-12">
-                    <div className="row">
-                      <div className="col-12 h-sm-25 overflow-auto mt-2">
-                        {selectedRole !== "" && (
                           <div className="row">
-                            {loading ? (
+                            {filteredEmployees?.map((emp) => {
-                              <div className="col-12">
+                              const jobRole = jobRoleData?.find(
-                                <p className="text-center">Loading...</p>
+                                (role) => role?.id === emp?.jobRoleId
-                              </div>
+                              );
-                            ) : filteredEmployees?.length > 0 ? (
-                              filteredEmployees?.map((emp) => {
-                                const jobRole = jobRoleData?.find(
-                                  (role) => role?.id === emp?.jobRoleId
-                                );
 
-                                return (
+                              return (
-                                  <div key={emp.id} className="col-6 col-md-4 col-lg-3 mb-3">
+                                <div
-                                    <div className="form-check d-flex align-items-start">
+                                  key={emp.id}
+                                  className="col-6 col-sm-6 col-md-4 col-lg-4 mb-1"
+                                >
+                                  <div className="form-check text-start p-0">
+                                    <div className="li-wrapper d-flex justify-content-start align-items-start">
                                       <Controller
                                         name="selectedEmployees"
                                         control={control}
                                         render={({ field }) => (
                                           <input
                                             {...field}
-                                            className="form-check-input me-1 mt-1"
+                                            className="form-check-input mx-2"
                                             type="checkbox"
                                             id={`employee-${emp?.id}`}
                                             value={emp.id}
-                                            checked={field.value.includes(emp.id)}
+                                            checked={field.value.includes(
-                                            onChange={(e) => {
+                                              emp.id
-                                              handleCheckboxChange(e, emp);
+                                            )}
+                                            onChange={() => {
+                                              handleEmployeeSelection(
+                                                emp.id,
+                                                field
+                                              );
                                             }}
                                           />
                                         )}
                                       />
-                                      <div className="flex-grow-1">
+                                      <div className="list-content">
-                                        <p className="mb-0" style={{ fontSize: "13px" }}>
+                                        <p
+                                          className=" mb-0"
+                                          style={{
+                                            fontSize: "12px",
+                                            fontWeight: "bolder",
+                                          }}
+                                        >
                                           {emp.firstName} {emp.lastName}
                                         </p>
-                                        <small className="text-muted" style={{ fontSize: "11px" }}>
+                                        <small
-                                          {loading ? (
+                                          className="lead"
-                                            <span className="placeholder-glow">
+                                          style={{ fontSize: "10px" }}
-                                              <span className="placeholder col-6"></span>
+                                        >
-                                            </span>
+                                          {loading && (
-                                          ) : (
+                                            <p
-                                            jobRole?.name || "Unknown Role"
+                                              className="skeleton para"
+                                              style={{ height: "7px" }}
+                                            ></p>
                                           )}
+                                          {data &&
+                                            !loading &&
+                                            (jobRole
+                                              ? jobRole.name
+                                              : "Unknown Role")}
                                         </small>
                                       </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 className="col-md text-start mx-0 px-0">
-                      <div className="form-check form-check-inline mt-3 px-1">
-                        <label className="form-text text-dark align-items-center d-flex" htmlFor="inlineCheckbox1">
-                          Pending Task of Activity :
-                          <label className="form-check-label fs-7 ms-4" htmlFor="inlineCheckbox1">
-                            <strong>
-                              {assignData?.workItem?.workItem?.plannedWork - assignData?.workItem?.workItem?.completedWork}
-                            </strong>{" "}
-                            <u>{assignData?.workItem?.workItem?.activityMaster?.unitOfMeasurement}</u>
-                          </label>
-
-                          <div style={{ display: "flex", alignItems: "center" }}>
-                            <div
-                              ref={infoRef}
-                              tabIndex="0"
-                              className="d-flex align-items-center avatar-group justify-content-center ms-2"
-                              data-bs-toggle="popover"
-                              data-bs-trigger="focus"
-                              data-bs-placement="right"
-                              data-bs-html="true"
-                              style={{ cursor: "pointer" }}
-                            >
-                              &nbsp;
-                              <svg
-                                xmlns="http://www.w3.org/2000/svg"
-                                width="13"
-                                height="13"
-                                fill="currentColor"
-                                className="bi bi-info-circle"
-                                viewBox="0 0 16 16"
-                              >
-                                <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
-                                <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.547 1.11l1.91-2.011c.241-.256.384-.592.287-.984-.172-.439-.58-.827-1.13-.967a.664.664 0 0 1-.58-.309l-.15-.241-.002-.002zM8 4c-.535 0-.943.372-.943.836 0 .464.408.836.943.836.535 0 .943-.372.943-.836 0-.464-.408-.836-.943-.836z" />
-                              </svg>
-                            </div>
-                          </div>
-                        </label>
-                      </div>
-                    </div>
-
-
-                    <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">
-                        <label
-                          className="text-dark text-start d-flex align-items-center flex-wrap form-text"
-                          htmlFor="inlineCheckbox1"
-                        >
-                          <span>Target for Today</span>&nbsp;<span style={{ marginLeft: '46px' }}>:</span>
-                        </label>
-                      </div>
-                      <div className="form-check form-check-inline col-sm-3  mt-2" style={{ marginLeft: '-28px' }}>
-                        <Controller
-                          name="plannedTask"
-                          control={control}
-                          render={({ field }) => (
-                            <div className="d-flex align-items-center gap-1 ">
-                              <input
-                                type="text"
-                                className="form-control form-control-sm"
-                                {...field}
-                                id="defaultFormControlInput"
-                                aria-describedby="defaultFormControlHelp"
-                              />
-                              <span style={{ paddingLeft: '6px' }}>
-                                {assignData?.workItem?.workItem?.activityMaster?.unitOfMeasurement}
-                              </span>
-                              <div style={{ display: "flex", alignItems: "center" }}>
-                                <div
-                                  ref={infoRef1}
-                                  tabIndex="0"
-                                  className="d-flex align-items-center avatar-group justify-content-center ms-2"
-                                  data-bs-toggle="popover"
-                                  data-bs-trigger="focus"
-                                  data-bs-placement="right"
-                                  data-bs-html="true"
-
-                                  style={{ cursor: "pointer" }}
-                                >
-                                  &nbsp;
-                                  <svg
-                                    xmlns="http://www.w3.org/2000/svg"
-                                    width="13"
-                                    height="13"
-                                    fill="currentColor"
-                                    className="bi bi-info-circle"
-                                    viewBox="0 0 16 16"
-                                  >
-                                    <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
-                                    <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.547 1.11l1.91-2.011c.241-.256.384-.592.287-.984-.172-.439-.58-.827-1.13-.967a.664.664 0 0 1-.58-.309l-.15-.241-.002-.002zM8 4c-.535 0-.943.372-.943.836 0 .464.408.836.943.836.535 0 .943-.372.943-.836 0-.464-.408-.836-.943-.836z" />
-                                  </svg>
-                                </div>
-                              </div>
-                            </div>
-                          )}
-                        />
-
-                      </div>
-
-                      {errors.plannedTask && (
-                        <div className="danger-text mt-1">{errors.plannedTask.message}</div>
-                      )}
-
-                      {isHelpVisible && (
-                        <div
-                          className="position-absolute bg-white border p-2 rounded shadow"
-                          style={{ zIndex: 10, marginLeft: '10px' }}
-                        >
-                          {/* Add your help content here */}
-                          <p className="mb-0">Enter the target value for today's task.</p>
-                        </div>
-                      )}
-                    </div>
-                    {errors.selectedEmployees && (
-                      <div className="danger-text mt-1">
-                        <p>{errors.selectedEmployees.message}</p>
                       </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="form-check form-check-inline mt-4 px-1">
+                    <label className="form-text fs-6" for="inlineCheckbox1">
+                      Pending Work
+                    </label>
                     <label
-                      className="form-text fs-7 m-1 text-lg text-dark"
+                      className="form-check-label ms-2"
-                      htmlFor="inlineCheckbox1"
+                      for="inlineCheckbox1"
                     >
-                      Description
+                      {assignData?.workItem?.workItem?.plannedWork -
+                        assignData?.workItem?.workItem?.completedWork}
+                    </label>
+                  </div>
+                  <div className="form-check form-check-inline col-sm-2 col">
+                    <label for="defaultFormControlInput" className="form-label">
+                      Target
                     </label>
                     <Controller
-                      name="description"
+                      name="plannedTask"
                       control={control}
                       render={({ field }) => (
-                        <textarea
+                        <input
+                          type="text"
+                          className="form-control form-control-xs"
                           {...field}
-                          className="form-control"
+                          id="defaultFormControlInput"
-                          id="exampleFormControlTextarea1"
+                          aria-describedby="defaultFormControlHelp"
-                          rows="2"
                         />
                       )}
                     />
-                    {errors.description && (
-                      <div className="danger-text">
-                        {errors.description.message}
-                      </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>
+                )}
 
-                  <div className="col-12 d-flex justify-content-center align-items-center gap-sm-6 gap-8 text-center mt-1">
+                <label for="exampleFormControlTextarea1" className="form-label">
-                    <button type="submit" className="btn btn-sm btn-primary ">
+                  Description
-                      Submit
+                </label>
-                    </button>
+                <Controller
-                    <button
+                  name="description"
-                      type="reset"
+                  control={control}
-                      className="btn btn-sm btn-label-secondary"
+                  render={({ field }) => (
-                      data-bs-dismiss="modal"
+                    <textarea
-                      aria-label="Close"
+                      {...field}
-                      onClick={closedModel}
+                      className="form-control"
-                    >
+                      id="exampleFormControlTextarea1"
-                      Cancel
+                      rows="2"
-                    </button>
+                    />
+                  )}
+                />
+                {errors.description && (
+                  <div className="danger-text">
+                    {errors.description.message}
                   </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>