From b004fe8c156a790fa1cdac1405cd68ab0c80a8aa Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Thu, 8 May 2025 11:05:33 +0530
Subject: [PATCH 1/7] added va;idation for contact person. it will accept only
 alphabetical character

---
 src/components/Project/ManageProjectInfo.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/Project/ManageProjectInfo.jsx b/src/components/Project/ManageProjectInfo.jsx
index 8b1550fc..a2bfc3a2 100644
--- a/src/components/Project/ManageProjectInfo.jsx
+++ b/src/components/Project/ManageProjectInfo.jsx
@@ -28,7 +28,10 @@ const ManageProjectInfo = ({ project, handleSubmitForm, onClose }) => {
       name: z.string().min(1, { message: "Project Name is required" }),
       contactPerson: z
         .string()
-        .min(1, { message: "Contact Person Name is required" }),
+        .min( 1, {message: "Contact Person Name is required"} )
+        .regex(/^[A-Za-z\s]+$/, {
+          message: "Contact Person must contain only letters",
+        }),
       projectAddress: z
         .string()
         .min(1, { message: "Address is required" })
@@ -156,6 +159,7 @@ const ManageProjectInfo = ({ project, handleSubmitForm, onClose }) => {
                 name="contactPerson"
                 className="form-control"
                 placeholder="Contact Person"
+                maxLength={50}
                 {...register("contactPerson")}
               />
               {errors.contactPerson && (

From 865cc7a3665fcd0a7a4bd0b570fccd71af89bd86 Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Thu, 8 May 2025 11:43:48 +0530
Subject: [PATCH 2/7] Reset Select Activity field and remove used activity
 after task submission

---
 src/components/Project/Infrastructure/TaskModel.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Project/Infrastructure/TaskModel.jsx b/src/components/Project/Infrastructure/TaskModel.jsx
index 810b38ea..43cb1c5b 100644
--- a/src/components/Project/Infrastructure/TaskModel.jsx
+++ b/src/components/Project/Infrastructure/TaskModel.jsx
@@ -110,6 +110,7 @@ const TaskModel = ({
     await onSubmit(data);
     setValue("plannedWork", 0);
     setValue( "completedWork", 0 );
+    setValue("activityID",0)
     setIsSubmitting(false);
   };
 
@@ -246,7 +247,7 @@ const TaskModel = ({
 
               {selectedWorkArea && (
                 <div className="col-12 col-md-12">
-                  <label className="form-label" htmlFor="activityID">
+                  <label className="form-label" >
                     Select Activity
                   </label>
                   <select

From 4175fb67c652b72b8fa3d10134a043fde6c21ce0 Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Thu, 8 May 2025 12:45:05 +0530
Subject: [PATCH 3/7] showing custom delete confirmation modal in master module
 until API is ready

---
 src/components/master/MasterModal.jsx | 66 ++++++++++++++++++---------
 1 file changed, 44 insertions(+), 22 deletions(-)

diff --git a/src/components/master/MasterModal.jsx b/src/components/master/MasterModal.jsx
index dbc8bbee..066e8a79 100644
--- a/src/components/master/MasterModal.jsx
+++ b/src/components/master/MasterModal.jsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState, useEffect } from "react";
 
 import CreateRole from "./CreateRole";
 import DeleteMaster from "./DeleteMaster";
@@ -7,8 +7,41 @@ import CreateJobRole from "./CreateJobRole";
 import EditJobRole from "./EditJobRole";
 import CreateActivity from "./CreateActivity";
 import EditActivity from "./EditActivity";
+import ConfirmModal from "../common/ConfirmModal";
 
 const MasterModal = ({ modaldata, closeModal }) => {
+  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+
+  useEffect(() => {
+    if (modaldata?.modalType === "delete") {
+      setIsDeleteModalOpen(true);
+    }
+  }, [modaldata]);
+
+  const handleCloseDeleteModal = () => {
+    setIsDeleteModalOpen(false);
+    closeModal(); 
+  };
+
+  if (modaldata?.modalType === "delete" && isDeleteModalOpen) {
+    return (
+      <div
+        className="modal fade show"
+        tabIndex="-1"
+        role="dialog"
+        style={{ display: "block", backgroundColor: "rgba(0,0,0,0.5)" }}
+        aria-hidden="false"
+      >
+        <ConfirmModal
+          type="delete"
+          header={`Delete ${modaldata.masterType}`}
+          message={"comming soon.."}
+          onClose={handleCloseDeleteModal}
+        />
+      </div>
+    );
+  }
+
   return (
     <div
       className="modal fade"
@@ -20,9 +53,7 @@ const MasterModal = ({ modaldata, closeModal }) => {
     >
       <div
         className={`modal-dialog mx-sm-auto mx-1 ${
-          ["Application Role", "Edit-Application Role"].includes(
-            modaldata?.modalType
-          )
+          ["Application Role", "Edit-Application Role"].includes(modaldata?.modalType)
             ? "modal-lg"
             : "modal-md"
         } modal-simple`}
@@ -36,33 +67,24 @@ const MasterModal = ({ modaldata, closeModal }) => {
               aria-label="Close"
               onClick={closeModal}
             ></button>
-            <div className="text-center mb-2"></div>
-            {modaldata?.modalType === "Application Role" && (
-              <CreateRole
-                masmodalType={modaldata.masterType}
-                onClose={closeModal}
-              />
+
+            {modaldata.modalType === "Application Role" && (
+              <CreateRole masmodalType={modaldata.masterType} onClose={closeModal} />
             )}
-            {modaldata?.modalType === "Edit-Application Role" && (
+            {modaldata.modalType === "Edit-Application Role" && (
               <EditRole master={modaldata} onClose={closeModal} />
             )}
-            {modaldata?.modalType === "delete" && (
-              <DeleteMaster master={modaldata} onClose={closeModal} />
-            )}
-            {modaldata?.modalType === "Job Role" && (
+            {modaldata.modalType === "Job Role" && (
               <CreateJobRole onClose={closeModal} />
             )}
-            {modaldata?.modalType === "Edit-Job Role" && (
+            {modaldata.modalType === "Edit-Job Role" && (
               <EditJobRole data={modaldata.item} onClose={closeModal} />
             )}
-            {modaldata?.modalType === "Activity" && (
+            {modaldata.modalType === "Activity" && (
               <CreateActivity onClose={closeModal} />
             )}
-            {modaldata?.modalType === "Edit-Activity" && (
-              <EditActivity
-                activityData={modaldata.item}
-                onClose={closeModal}
-              />
+            {modaldata.modalType === "Edit-Activity" && (
+              <EditActivity activityData={modaldata.item} onClose={closeModal} />
             )}
           </div>
         </div>

From 7fa502f44c325462571d5df6fc0d78f37f5d9074 Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Thu, 8 May 2025 13:19:28 +0530
Subject: [PATCH 4/7] project list or card will display 10 per page.

---
 src/pages/project/ProjectList.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/project/ProjectList.jsx b/src/pages/project/ProjectList.jsx
index d8568140..a08b2cce 100644
--- a/src/pages/project/ProjectList.jsx
+++ b/src/pages/project/ProjectList.jsx
@@ -25,7 +25,7 @@ const ProjectList = () => {
   const dispatch = useDispatch();
 
   const [currentPage, setCurrentPage] = useState(1);
-  const [itemsPerPage] = useState(6);
+  const [itemsPerPage] = useState(10);
   const [searchTerm, setSearchTerm] = useState("");
   const [selectedStatuses, setSelectedStatuses] = useState([
     "b74da4c2-d07e-46f2-9919-e75e49b12731",

From 31612888714cae69d425f86586cafa4de903d8cf Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Thu, 8 May 2025 15:23:45 +0530
Subject: [PATCH 5/7] handled server negative response, in user readable format

---
 src/components/Employee/ManageEmployee.jsx | 3 ++-
 src/components/Employee/ManageRole.jsx     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/Employee/ManageEmployee.jsx b/src/components/Employee/ManageEmployee.jsx
index b158694b..97b58d5b 100644
--- a/src/components/Employee/ManageEmployee.jsx
+++ b/src/components/Employee/ManageEmployee.jsx
@@ -194,7 +194,8 @@ const ManageEmployee = () => {
         navigation("/employees");
       })
       .catch((error) => {
-        showToast(error.message, "error");
+        const message  = error?.response?.data?.message || error?.message || "Error occured during api calling"
+        showToast(message, "error");
         setLoading(false);
       });
   };
diff --git a/src/components/Employee/ManageRole.jsx b/src/components/Employee/ManageRole.jsx
index d24384c1..49794541 100644
--- a/src/components/Employee/ManageRole.jsx
+++ b/src/components/Employee/ManageRole.jsx
@@ -157,9 +157,9 @@ const ManageRole = ( {employeeId, onClosed} ) =>
         reset();
         onClosed();
       })
-      .catch((err) => {
-        console.error(err);
-        showToast(err.message, "error");
+      .catch((error) => {
+        const message  = error?.response?.data?.message || error?.message || "Error occured during api calling"
+        showToast(message, "error");
         setIsLoading(false);
       });
   };

From 9ac15d3cf7604afe7dbe3efb063a7580100bb4aa Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Thu, 8 May 2025 12:00:58 +0530
Subject: [PATCH 6/7] restrict employee search to first and last name fields
 only

---
 src/pages/employee/EmployeeList.jsx | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx
index a7f0a723..dcd931ef 100644
--- a/src/pages/employee/EmployeeList.jsx
+++ b/src/pages/employee/EmployeeList.jsx
@@ -46,17 +46,16 @@ const EmployeeList = () => {
   const handleSearch = (e) => {
     const value = e.target.value.toLowerCase();
     setSearchText(value);
-
+  
     if (!employeeList.length) return;
-
-    const results = employeeList.filter((item) =>
-      Object.values(item).some(
-        (field) => field && field.toString().toLowerCase().includes(value)
-      )
-    );
-
+  
+    const results = employeeList.filter((item) => {
+      const fullName = `${item.firstName} ${item.lastName}`.toLowerCase();
+      return fullName.includes(value);
+    });
+  
     setFilteredData(results);
-  };
+  }; 
 
   useEffect(() => {
     setCurrentPage(1);

From ba763f986d027272785d5a3e567d640ac432cda4 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 8 May 2025 15:29:27 +0530
Subject: [PATCH 7/7] Added logic to the employee list to hide the 'Manage
 Role' and 'Suspend' buttons for system-defined employees

---
 src/pages/employee/EmployeeList.jsx    | 4 ++--
 src/repositories/MastersRepository.jsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx
index dcd931ef..646a98a9 100644
--- a/src/pages/employee/EmployeeList.jsx
+++ b/src/pages/employee/EmployeeList.jsx
@@ -556,7 +556,7 @@ const EmployeeList = () => {
                                   >
                                     <i className="bx bx-edit bx-sm"></i> Edit
                                   </Link>
-                                  <button
+                                  {!item.isSystem && (<><button
                                     className="dropdown-item py-1"
                                     onClick={() => suspendEmployee(item.id)}
                                   >
@@ -572,7 +572,7 @@ const EmployeeList = () => {
                                   >
                                     <i className="bx bx-cog bx-sm"></i> Manage
                                     Role
-                                  </button>
+                                  </button></>)}
                                 </div>
                               </div>
                             </td>
diff --git a/src/repositories/MastersRepository.jsx b/src/repositories/MastersRepository.jsx
index 6f354fbd..e66ffad7 100644
--- a/src/repositories/MastersRepository.jsx
+++ b/src/repositories/MastersRepository.jsx
@@ -15,7 +15,7 @@ export const RolesRepository = {
   
 
   getEmployeeRoles:(id)=>api.get(`/api/employee/roles/${id}`),
-  createEmployeeRoles:(data)=>api.post("/api/employee/roles",data)
+  createEmployeeRoles:(data)=>api.post("/api/roles/assign-roles",data)
 };