admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

“NA” Should Be Displayed When Employee Has No Email Instead of “–” #476

Merged
pramod.mahajan merged 1 commits from Kartik_Bug#1451 into Issues_Oct_main_2W 2025-10-13 09:32:51 +00:00
Conversation 0 Commits 1 Files Changed 3 +26 -27
3 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Documents/Documents.jsx
View File

@ -149,7 +149,7 @@ const Documents = ({ Document_Entity, Entity }) => {
</label>
</div>
<div className="col-6 col-md-6 col-lg-8 text-end">
<div className="col-12 col-md-6 col-lg-8 text-end">
{(isSelf || canUploadDocument) && (
<button
className="btn btn-sm btn-primary me-3"

1
src/components/Employee/EmpAttendance.jsx
View File

@ -51,7 +51,6 @@ const EmpAttendance = () => {
new Date(b?.checkInTime).getTime() - new Date(a?.checkInTime).getTime()
);
console.log(sorted);
const { currentPage, totalPages, currentItems, paginate } = usePagination(
sorted,

50
src/pages/employee/EmployeeList.jsx
View File

@ -176,12 +176,10 @@ const EmployeeList = () => {
useEffect(() => {
if (!loading && Array.isArray(employees)) {
const sorted = [...employees].sort((a, b) => {
const nameA = `${a.firstName || ""}${a.middleName || ""}${
a.lastName || ""
}`.toLowerCase();
const nameB = `${b.firstName || ""}${b.middleName || ""}${
b.lastName || ""
}`.toLowerCase();
const nameA = `${a.firstName || ""}${a.middleName || ""}${a.lastName || ""
}`.toLowerCase();
const nameB = `${b.firstName || ""}${b.middleName || ""}${b.lastName || ""
}`.toLowerCase();
return nameA?.localeCompare(nameB);
});
@ -258,9 +256,8 @@ const EmployeeList = () => {
? "Suspend Employee"
: "Reactivate Employee"
}
message={`Are you sure you want to ${
selectedEmpFordelete?.isActive ? "suspend" : "reactivate"
} this employee?`}
message={`Are you sure you want to ${selectedEmpFordelete?.isActive ? "suspend" : "reactivate"
} this employee?`}
onSubmit={(id) =>
suspendEmployee({
employeeId: id,
@ -471,9 +468,8 @@ const EmployeeList = () => {
Status
</th>
<th
className={`sorting_disabled ${
!Manage_Employee && "d-none"
}`}
className={`sorting_disabled ${!Manage_Employee && "d-none"
}`}
rowSpan="1"
colSpan="1"
style={{ width: "50px" }}
@ -493,20 +489,20 @@ const EmployeeList = () => {
)}
{!loading &&
displayData?.length === 0 &&
(!searchText ) ? (
displayData?.length === 0 &&
(!searchText) ? (
<tr>
<td colSpan={8} className="border-0 py-3">
<div className="py-4">
<div className="py-4">
No Data Found
</div>
</div>
</td>
</tr>
) : null}
{!loading &&
displayData?.length === 0 &&
(searchText ) ? (
{!loading &&
displayData?.length === 0 &&
(searchText) ? (
<tr>
<td colSpan={8} className="border-0 py-3">
<div className="py-4">
@ -542,18 +538,17 @@ const EmployeeList = () => {
</div>
</div>
</td>
<td className="text-start d-none d-sm-table-cell">
<td className="text-start d-none d-sm-table-cell">
{item.email ? (
<span className="text-truncate">
<i className="bx bxs-envelope text-primary me-2"></i>
{item.email}
</span>
) : (
<span className="text-truncate text-italic">
-
</span>
<span className="d-block text-start text-muted fst-italic">NA</span>
)}
</td>
<td className="text-start d-none d-sm-table-cell">
<span className="text-truncate">
<i className="bx bxs-phone-call text-primary me-2"></i>
@ -567,9 +562,14 @@ const EmployeeList = () => {
</span>
</td>
<td className=" d-none d-md-table-cell">
{moment(item.joiningDate)?.format("DD-MMM-YYYY")}
<td className="d-none d-md-table-cell">
{item.joiningDate ? (
moment(item.joiningDate).format("DD-MMM-YYYY")
) : (
<span className="d-block text-center text-muted fst-italic">NA</span>
)}
</td>
<td>
{showInactive ? (
<span