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

Add an Organization column in the Attendance grid across all tabs. #414

Merged
vikas.nale merged 2 commits from Kartik_Task_OrgCol_att#1238 into Organization_Management 2025-09-21 11:11:21 +00:00
Conversation 0 Commits 2 Files Changed 3 +19 -6
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/Activities/Attendance.jsx
View File

@ -142,6 +142,7 @@ const Attendance = ({ getRole, handleModalData, searchTerm }) => {
<tr className="border-top-1">
<th colSpan={2}>Name</th>
<th>Role</th>
<th>Organization</th>
<th>
<i className="bx bxs-down-arrow-alt text-success"></i>
Check-In
@ -190,6 +191,8 @@ const Attendance = ({ getRole, handleModalData, searchTerm }) => {
</td>
<td>{item.jobRoleName}</td>
<td>{item.organizationName || "--"}</td>
<td>
{item.checkInTime
? convertShortTime(item.checkInTime)
@ -213,7 +216,11 @@ const Attendance = ({ getRole, handleModalData, searchTerm }) => {
))}
{!attendance && (
<tr>
<td colSpan={6} className="text-center text-secondary" style={{ height: "200px" }}>
<td
colSpan={7}
className="text-center text-secondary"
style={{ height: "200px" }}
>
No employees assigned to the project!
</td>
</tr>
@ -221,6 +228,7 @@ const Attendance = ({ getRole, handleModalData, searchTerm }) => {
</tbody>
</table>
{!loading && finalFilteredData.length > ITEMS_PER_PAGE && (
<nav aria-label="Page ">
<ul className="pagination pagination-sm justify-content-end py-1">

7
src/components/Activities/AttendcesLogs.jsx
View File

@ -264,9 +264,9 @@ const AttendanceLog = ({ handleModalData, searchTerm }) => {
Name
</th>
<th className="border-top-1">Date</th>
<th>Organization</th>
<th>
<i className="bx bxs-down-arrow-alt text-success"></i>{" "}
Check-In
<i className="bx bxs-down-arrow-alt text-success"></i> Check-In
</th>
<th>
<i className="bx bxs-up-arrow-alt text-danger"></i> Check-Out
@ -293,7 +293,7 @@ const AttendanceLog = ({ handleModalData, searchTerm }) => {
key={`header-${currentDate}`}
className="table-row-header"
>
<td colSpan={6} className="text-start">
<td colSpan={8} className="text-start">
<strong>
{moment(currentDate).format("DD-MM-YYYY")}
</strong>
@ -323,6 +323,7 @@ const AttendanceLog = ({ handleModalData, searchTerm }) => {
attendance.checkInTime || attendance.checkOutTime
).format("DD-MMM-YYYY")}
</td>
<td>{attendance.organizationName || "--"}</td>
<td>{convertShortTime(attendance.checkInTime)}</td>
<td>
{attendance.checkOutTime

8
src/components/Activities/Regularization.jsx
View File

@ -98,6 +98,7 @@ const Regularization = ({ handleRequest, searchTerm }) => {
<tr>
<th colSpan={2}>Name</th>
<th>Date</th>
<th>Organization</th>
<th>
<i className="bx bxs-down-arrow-alt text-success"></i>Check-In
</th>
@ -115,7 +116,7 @@ const Regularization = ({ handleRequest, searchTerm }) => {
<Avatar
firstName={att.firstName}
lastName={att.lastName}
></Avatar>
/>
<div className="d-flex flex-column">
<a href="#" className="text-heading text-truncate">
<span className="fw-normal">
@ -126,6 +127,9 @@ const Regularization = ({ handleRequest, searchTerm }) => {
</div>
</td>
<td>{moment(att.checkOutTime).format("DD-MMM-YYYY")}</td>
<td>{att.organizationName || "--"}</td>
<td>{convertShortTime(att.checkInTime)}</td>
<td>
{att.checkOutTime ? convertShortTime(att.checkOutTime) : "--"}
@ -136,12 +140,12 @@ const Regularization = ({ handleRequest, searchTerm }) => {
handleRequest={handleRequest}
refresh={refetch}
/>
{/* </div> */}
</td>
</tr>
))}
</tbody>
</table>
) : (
<div
className="d-flex justify-content-center align-items-center"