changed input size

src/components/Activities/ReportTask.jsx

@@ -76,20 +76,12 @@ useEffect(() => {
   };
 
   return (
-    <div
-      className="modal-dialog modal-md modal-simple report-task-modal"
-      role="document"
-    >
-      <div className="modal-content">
-        <div className="modal-body px-1">
-          <button
-            type="button"
-            className="btn-close"
-            onClick={handleClose}
-            aria-label="Close"
-          ></button>
+
 
     <div className="container  m-0">
+      <div className="text-center">
+        <p className="fs-6 fw-semibold">Report Task</p>
+      </div>
             <div className="mb-1 row text-start">
               <label
                 htmlFor="html5-text-input"
@@ -231,8 +223,6 @@ useEffect(() => {
               </div>
             </form>
           </div>
-        </div>
-      </div>
-    </div>
+   
   );
 };

src/components/Activities/SubTask.jsx

@@ -48,8 +48,8 @@ const SubTask = ({ activity, onClose }) => {
     if (Task?.workItem) {
       reset({
         workCategoryId: Task?.workItem?.workCategoryId || "",
-        activityId: Task?.workItem?.activityId || "",
-        plannedWork: Number(Task.notApprovedTask || Task.workItem?.plannedWork),
+        activityId: Task?.workItem?.activityId || activity?.workItem?.activityId,
+        plannedWork: Number(Task?.notApprovedTask || Task?.workItem?.plannedWork),
         completedWork: 0,
         comment: "",
       });
@@ -90,7 +90,6 @@ const SubTask = ({ activity, onClose }) => {
       showToast(msg, "error");
     }
   };
-
   return (
     <div className="container-xxl my-1">
       <p className="fw-semibold">Create Sub Task</p>
@@ -132,7 +131,7 @@ const SubTask = ({ activity, onClose }) => {
             {...register("workCategoryId")}
             onChange={handleCategoryChange}
           >
-            <option value="">-- Select Category --</option>
+            <option value="">{categoryLoading ?  "Loading..." : "-- Select Category --" }</option>
             {categoryData.map((category) => (
               <option key={category.id} value={category.id}>
                 {category.name}
@@ -147,10 +146,11 @@ const SubTask = ({ activity, onClose }) => {
           <label className="form-label">Select Activity</label>
           <select
             className="form-select form-select-sm"
-            {...register("activityId")}
+            {...register( "activityId" )}
+            disabled
           >
             <option value="">
-              {categoryLoading ? "Loading..." : "--Select Activity--"}
+              {categoryLoading && "Loading..." }
             </option>
             {activities?.map((activity) => (
               <option key={activity.id} value={activity.id}>
@@ -180,7 +180,8 @@ const SubTask = ({ activity, onClose }) => {
           <input
             type="number"
             className="form-control form-control-sm"
-            {...register("completedWork")}
+            {...register( "completedWork" )}
+            disabled
           />
           {errors.completedWork && (
             <div className="danger-text">{errors.completedWork.message}</div>
@@ -210,7 +211,7 @@ const SubTask = ({ activity, onClose }) => {
         </div>
 
         <div className="col-12 text-center">
-          <button type="submit" className="btn btn-sm btn-primary me-2">
+          <button type="submit" className="btn btn-sm btn-primary me-2"   disabled={isSubmitting}>
             {isSubmitting ? "Please wait..." : "Submit"}
           </button>
           <button

src/components/Employee/ManageEmployee.jsx

@@ -233,24 +233,14 @@ const ManageEmployee = ({ employeeId, onClosed }) => {
 
   return (
     <>
-      <div className=" row">
-        <div className="col-xl">
-          <div className="card">
-            <div className="card-header d-flex align-items-center justify-content-between">
-              <h6 className="mb-0">
-                {employee ? "Update Employee" : "Create Employee"}
-              </h6>
      
-              <span className="cursor-pointer fs-6" onClick={() => onClosed()}>
-                <i className="bx bx-x"></i>
-              </span>
-            </div>
-            <div className="card-body">
+            {/* <div className="c">
               {!currentEmployee && empLoading && employeeId && (
                 <p>Loading Employee Data...</p>
-              )}
+              )} */}
 
-              <form onSubmit={handleSubmit(onSubmit)}>
+      <form onSubmit={handleSubmit( onSubmit )} className="p-sm-0 p-2">
+        <div className="text-center"><p className="fs-6 fw-semibold"> {employee ? "Update Employee" : "Create Employee"}</p></div>
                 <div className="row mb-3">
                   <div className="col-sm-4">
                     {" "}
@@ -646,10 +636,7 @@ const ManageEmployee = ({ employeeId, onClosed }) => {
                   </div>
                 </div>
               </form>
-            </div>
-          </div>
-        </div>
-      </div>
+          
     </>
   );
 };

src/components/Project/AssignTask.jsx

@@ -170,7 +170,8 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
 
     try {
       await TasksRepository.assignTask(formattedData);
-      setIsSubmitting(false);
+      setIsSubmitting( false );
+      showToast("Task Assined Successfully.", "success");
       closedModel();
     } catch (error) {
       setIsSubmitting(false);
@@ -546,7 +547,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
               <button
                 type="submit"
                 className="btn btn-sm btn-primary "
-                disabled={(isSubmitting, loading)}
+                disabled={isSubmitting || loading}
               >
                 {isSubmitting ? "Please Wait" : "Submit"}
               </button>

src/components/Project/Infrastructure/WorkItem.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import AssignRoleModel from "../AssignTask";
+import AssignTask from "../AssignTask";
 import { useParams } from "react-router-dom";
 import EditActivityModal from "./EditActivityModal";
 import { useHasUserPermission } from "../../../hooks/useHasUserPermission";
@@ -100,7 +100,7 @@ const WorkItem = ({
     <>
       {isModalOpen && (
         <GlobalModel isOpen={isModalOpen} size="lg" closeModal={closeModal}>
-           <AssignRoleModel assignData={assigndata} onClose={closeModal} setAssigned={refreshWorkItem} />
+           <AssignTask assignData={assigndata} onClose={closeModal} setAssigned={refreshWorkItem} />
         </GlobalModel>
       )}
 

src/pages/Activities/DailyTask.jsx

@@ -172,19 +172,15 @@ const DailyTask = () => {
   };
   return (
     <>
-      <div
-        className={`modal fade ${isModalOpen ? "show d-block" : ""}`}
-        tabIndex="-1"
-        role="dialog"
-        style={{ display: isModalOpen ? "block" : "none" }}
-        aria-hidden={!isModalOpen}
-      >
+      
+
+      {isModalOpen && <GlobalModel isOpen={isModalOpen} size="md" closeModal={()=>setIsModalOpen(false)} >
         <ReportTask
           report={selectedTask}
           closeModal={closeModal}
           refetch={refetch}
         />
-      </div>
+      </GlobalModel>}
 
       {isModalOpenComment && (
         <GlobalModel

src/pages/Directory/DirectoryPageHeader.jsx

@@ -32,7 +32,7 @@ const DirectoryPageHeader = ({
         <div className="col-12 col-md-6 mb-2 px-1 d-flex align-items-center gap-4 ">
           <input
             type="search"
-            className="form-control me-2"
+            className="form-control form-control-sm me-2"
             placeholder="Search Contact..."
             value={searchText}
             onChange={(e) => setSearchText(e.target.value)}

src/pages/employee/EmployeeList.jsx

@@ -25,6 +25,7 @@ import ConfirmModal from "../../components/common/ConfirmModal";
 import { useSelector } from "react-redux";
 import eventBus from "../../services/eventBus";
 import { newlineChars } from "pdf-lib";
+import GlobalModel from "../../components/common/GlobalModel";
 
 const EmployeeList = () => {
   const selectedProjectId = useSelector((store) => store.localVariables.projectId);
@@ -239,7 +240,7 @@ const EmployeeList = () => {
       {isCreateModalOpen && (
         <ManageEmp employeeId={modelConfig} onClosed={closeModal} />
       )}
-      {showModal && (<div
+      {/* {showModal && (<div
         className={`modal fade ${showModal ? "show" : ""} `}
         tabIndex="-1"
         role="dialog"
@@ -257,7 +258,16 @@ const EmployeeList = () => {
             />
           </div>
         </div>
-      </div>)}
+      </div> )} */}
+      
+      {showModal && (
+        <GlobalModel isOpen={showModal} size="lg" closeModal={()=>setShowModal(false)}>
+           <ManageEmployee
+              employeeId={selectedEmployeeId}
+              onClosed={()=>setShowModal(false)}
+            />
+        </GlobalModel>
+     )}
 
       {IsDeleteModalOpen && (
         <div