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

Incorrect Date Format Displayed in Attendance Logs #491

Closed
kartik.sharma wants to merge 2 commits from Kartik_Bug_V1#1572 into Issues_Oct_4W_V1
pull from: Kartik_Bug_V1#1572
merge into: admin:Issues_Oct_4W_V1
Conversation 1 Commits 2 Files Changed 1 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
import React, { useEffect, useState, useMemo, useCallback } from "react"; import React, { useEffect, useState, useMemo, useCallback } from "react";
import moment from "moment"; import moment from "moment";
import Avatar from "../common/Avatar"; import Avatar from "../common/Avatar";
import { convertShortTime } from "../../utils/dateUtils"; import { convertShortTime, formatUTCToLocalTime } from "../../utils/dateUtils";
import RenderAttendanceStatus from "./RenderAttendanceStatus"; import RenderAttendanceStatus from "./RenderAttendanceStatus";
import { useSelector, useDispatch } from "react-redux"; import { useSelector, useDispatch } from "react-redux";
import DateRangePicker from "../common/DateRangePicker"; import DateRangePicker from "../common/DateRangePicker";
@ -256,7 +256,7 @@ const AttendanceLog = ({ handleModalData, searchTerm, organizationId }) => {
> >
<td colSpan={8} className="text-start"> <td colSpan={8} className="text-start">
<strong> <strong>
{moment(currentDate).format("DD-MM-YYYY")} {formatUTCToLocalTime(currentDate)}
</strong> </strong>
</td> </td>
</tr> </tr>