From 562a4ca46d3deb33109943b56d8b360efeb96a35 Mon Sep 17 00:00:00 2001 From: Kartik sharma Date: Mon, 30 Jun 2025 16:27:12 +0530 Subject: [PATCH 1/2] "Changes in the employee popup size." --- src/components/Employee/ManageEmployee.jsx | 2 +- src/pages/Activities/TaskPlannng.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Employee/ManageEmployee.jsx b/src/components/Employee/ManageEmployee.jsx index 7cb4b0f1..58194227 100644 --- a/src/components/Employee/ManageEmployee.jsx +++ b/src/components/Employee/ManageEmployee.jsx @@ -239,7 +239,7 @@ const ManageEmployee = ({ employeeId, onClosed }) => {

Loading Employee Data...

)} */} -
+

{employee ? "Update Employee" : "Create Employee"}

diff --git a/src/pages/Activities/TaskPlannng.jsx b/src/pages/Activities/TaskPlannng.jsx index d4fcd2a1..d532696e 100644 --- a/src/pages/Activities/TaskPlannng.jsx +++ b/src/pages/Activities/TaskPlannng.jsx @@ -112,7 +112,7 @@ const TaskPlannng = () => { {project_listLoader &&

Loading..

} From 84563812b709246f81dfb269c40da1bc269ca6e7 Mon Sep 17 00:00:00 2001 From: Kartik sharma Date: Mon, 30 Jun 2025 16:42:58 +0530 Subject: [PATCH 2/2] Adding cross button in Employee popup. --- src/components/Employee/ManageEmployee.jsx | 822 +++++++++++---------- 1 file changed, 414 insertions(+), 408 deletions(-) diff --git a/src/components/Employee/ManageEmployee.jsx b/src/components/Employee/ManageEmployee.jsx index 58194227..e3c34b30 100644 --- a/src/components/Employee/ManageEmployee.jsx +++ b/src/components/Employee/ManageEmployee.jsx @@ -172,8 +172,7 @@ const ManageEmployee = ({ employeeId, onClosed }) => { .then((response) => { cacheData("employeeProfileInfo", data); showToast( - `Employee details ${ - data.id == null ? "created" : "updated" + `Employee details ${data.id == null ? "created" : "updated" } successfully.`, "success" ); @@ -207,24 +206,24 @@ const ManageEmployee = ({ employeeId, onClosed }) => { reset( currentEmployee ? { - id: currentEmployee.id || null, - firstName: currentEmployee.firstName || "", - middleName: currentEmployee.middleName || "", - lastName: currentEmployee.lastName || "", - email: currentEmployee.email || "", - currentAddress: currentEmployee.currentAddress || "", - birthDate: formatDate(currentEmployee.birthDate) || "", - joiningDate: formatDate(currentEmployee.joiningDate) || "", - emergencyPhoneNumber: currentEmployee.emergencyPhoneNumber || "", - emergencyContactPerson: - currentEmployee.emergencyContactPerson || "", - aadharNumber: currentEmployee.aadharNumber || "", - gender: currentEmployee.gender || "", - panNumber: currentEmployee.panNumber || "", - permanentAddress: currentEmployee.permanentAddress || "", - phoneNumber: currentEmployee.phoneNumber || "", - jobRoleId: currentEmployee.jobRoleId?.toString() || "", - } + id: currentEmployee.id || null, + firstName: currentEmployee.firstName || "", + middleName: currentEmployee.middleName || "", + lastName: currentEmployee.lastName || "", + email: currentEmployee.email || "", + currentAddress: currentEmployee.currentAddress || "", + birthDate: formatDate(currentEmployee.birthDate) || "", + joiningDate: formatDate(currentEmployee.joiningDate) || "", + emergencyPhoneNumber: currentEmployee.emergencyPhoneNumber || "", + emergencyContactPerson: + currentEmployee.emergencyContactPerson || "", + aadharNumber: currentEmployee.aadharNumber || "", + gender: currentEmployee.gender || "", + panNumber: currentEmployee.panNumber || "", + permanentAddress: currentEmployee.permanentAddress || "", + phoneNumber: currentEmployee.phoneNumber || "", + jobRoleId: currentEmployee.jobRoleId?.toString() || "", + } : {} // Empty object resets the form ); setCurrentAddressLength(currentEmployee?.currentAddress?.length || 0); @@ -233,410 +232,417 @@ const ManageEmployee = ({ employeeId, onClosed }) => { return ( <> - - {/*
+ + {/*
{!currentEmployee && empLoading && employeeId && (

Loading Employee Data...

)} */} - + + {/* Cross button */} +

{employee ? "Update Employee" : "Create Employee"}

-
-
- {" "} -
First Name
- - {errors.firstName && ( -
- {errors.firstName.message} -
- )} -
{" "} -
-
Middle Name
+
+
+ {" "} +
First Name
+ + {errors.firstName && ( +
+ {errors.firstName.message} +
+ )} +
{" "} +
+
Middle Name
- - {errors.middleName && ( -
- {errors.middleName.message} -
- )} -
-
-
Last Name
- - {errors.lastName && ( -
- {errors.lastName.message} -
- )} -
-
-
-
-
Email
- - {errors.email && ( -
- {errors.email.message} -
- )} -
-
-
Phone Number
- - {errors.phoneNumber && ( -
- {errors.phoneNumber.message} -
- )} -
-
-
-
-
-
Gender
+ + {errors.middleName && ( +
+ {errors.middleName.message} +
+ )} +
+
+
Last Name
+ + {errors.lastName && ( +
+ {errors.lastName.message} +
+ )} +
+
+
+
+
Email
+ + {errors.email && ( +
+ {errors.email.message} +
+ )} +
+
+
Phone Number
+ + {errors.phoneNumber && ( +
+ {errors.phoneNumber.message} +
+ )} +
+
+
+
+
+
Gender
-
- -
- {errors.gender && ( -
- {errors.gender.message} -
- )} -
-
-
Birth Date
+
+ +
+ {errors.gender && ( +
+ {errors.gender.message} +
+ )} +
+
+
Birth Date
-
- -
- {errors.birthDate && ( -
- {errors.birthDate.message} -
- )} -
-
-
Joining Date
+
+ +
+ {errors.birthDate && ( +
+ {errors.birthDate.message} +
+ )} +
+
+
Joining Date
-
- -
- {errors.joiningDate && ( -
- {errors.joiningDate.message} -
- )} -
-
-
-
-
Current Address
+
+ +
+ {errors.joiningDate && ( +
+ {errors.joiningDate.message} +
+ )} +
+
+
+
+
Current Address
- -
- - {" "} - {500 - currentAddressLength} characters left - -
- {errors.currentAddress && ( -
- {errors.currentAddress.message} -
- )} -
-
-
- Permanent Address -
+ +
+ + {" "} + {500 - currentAddressLength} characters left + +
+ {errors.currentAddress && ( +
+ {errors.currentAddress.message} +
+ )} +
+
+
+ Permanent Address +
- -
- - {500 - permanentAddressLength} characters left - -
- {errors.permanentAddress && ( -
- {errors.permanentAddress.message} -
- )} -
-
-
- {" "} -
-
Other Information
-
-
-
-
-
Role
-
- -
- {errors.jobRoleId && ( -
- {errors.jobRoleId.message} -
- )} -
-
-
- Emergency Contact Person -
- - {errors.emergencyContactPerson && ( -
- {errors.emergencyContactPerson.message} -
- )} -
-
-
- Emergency Phone Number -
- - {errors.emergencyPhoneNumber && ( -
- {errors.emergencyPhoneNumber.message} -
- )} -
-
-
-
-
AADHAR Number
+ +
+ + {500 - permanentAddressLength} characters left + +
+ {errors.permanentAddress && ( +
+ {errors.permanentAddress.message} +
+ )} +
+
+
+ {" "} +
+
Other Information
+
+
+
+
+
Role
+
+ +
+ {errors.jobRoleId && ( +
+ {errors.jobRoleId.message} +
+ )} +
+
+
+ Emergency Contact Person +
+ + {errors.emergencyContactPerson && ( +
+ {errors.emergencyContactPerson.message} +
+ )} +
+
+
+ Emergency Phone Number +
+ + {errors.emergencyPhoneNumber && ( +
+ {errors.emergencyPhoneNumber.message} +
+ )} +
+
+
+
+
AADHAR Number
- - {errors.aadharNumber && ( -
- {errors.aadharNumber.message} -
- )} -
-
-
PAN Number
+ + {errors.aadharNumber && ( +
+ {errors.aadharNumber.message} +
+ )} +
+
+
PAN Number
- - {errors.panNumber && ( -
- {errors.panNumber.message} -
- )} -
-
+ + {errors.panNumber && ( +
+ {errors.panNumber.message} +
+ )} +
+
- {employeeId && ( -
-
- -
-
- )} + {employeeId && ( +
+
+ +
+
+ )} -
-
- +
+
+ + + +
+
+ - -
-
- - ); };